The patch titled
Subject: ocfs2: removes mlog_errno() call twice in ocfs2_find_dir_space_el()
has been added to the -mm tree. Its filename is
ocfs2-removes-mlog_errno-call-twice-in-ocfs2_find_dir_space_el.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-removes-mlog_errno-call-twice-in-ocfs2_find_dir_space_el.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-removes-mlog_errno-call-twice-in-ocfs2_find_dir_space_el.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Daeseok Youn <daeseok.youn@xxxxxxxxx>
Subject: ocfs2: removes mlog_errno() call twice in ocfs2_find_dir_space_el()
mlog_errno() is called twice when some functions are failed.
Signed-off-by: Daeseok Youn <daeseok.youn@xxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dir.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff -puN fs/ocfs2/dir.c~ocfs2-removes-mlog_errno-call-twice-in-ocfs2_find_dir_space_el fs/ocfs2/dir.c
--- a/fs/ocfs2/dir.c~ocfs2-removes-mlog_errno-call-twice-in-ocfs2_find_dir_space_el
+++ a/fs/ocfs2/dir.c
@@ -3456,10 +3456,8 @@ static int ocfs2_find_dir_space_el(struc
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(struc
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;
}
_
Patches currently in -mm which might be from daeseok.youn@xxxxxxxxx are
ocfs2-remove-unreachable-code.patch
ocfs2-removes-mlog_errno-call-twice-in-ocfs2_find_dir_space_el.patch
ocfs2-remove-unreachable-code-in-__ocfs2_recovery_thread.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
