projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
592a202
)
ocfs2: removes mlog_errno() call twice in ocfs2_find_dir_space_el()
author
Daeseok Youn
<
[email protected]
>
Tue, 10 Feb 2015 22:09:15 +0000
(14:09 -0800)
committer
Linus Torvalds
<
[email protected]
>
Tue, 10 Feb 2015 22:30:29 +0000
(14:30 -0800)
mlog_errno() is called twice when some functions are failed.
Signed-off-by: Daeseok Youn <
[email protected]
>
Cc: Mark Fasheh <
[email protected]
>
Cc: Joel Becker <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
fs/ocfs2/dir.c
patch
|
blob
|
history
diff --git
a/fs/ocfs2/dir.c
b/fs/ocfs2/dir.c
index 940be6d994a92726cddec8f0e63672a91405d8db..b08050bd3f2ef81a2c2f053042ac7e9e763e3718 100644
(file)
--- a/
fs/ocfs2/dir.c
+++ b/
fs/ocfs2/dir.c
@@
-3456,10
+3456,8
@@
static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,
int blocksize = dir->i_sb->s_blocksize;
status = ocfs2_read_dir_block(dir, 0, &bh, 0);
- if (status) {
- mlog_errno(status);
+ if (status)
goto bail;
- }
rec_len = OCFS2_DIR_REC_LEN(namelen);
offset = 0;
@@
-3480,10
+3478,9
@@
static int ocfs2_find_dir_space_el(struct inode *dir, const char *name,
status = ocfs2_read_dir_block(dir,
offset >> sb->s_blocksize_bits,
&bh, 0);
- if (status) {
- mlog_errno(status);
+ if (status)
goto bail;
- }
+
/* move to next block */
de = (struct ocfs2_dir_entry *) bh->b_data;
}