The patch titled Subject: ocfs2: removes mlog_errno() call twice in ocfs2_find_dir_space_el() has been removed from the -mm tree. Its filename was ocfs2-removes-mlog_errno-call-twice-in-ocfs2_find_dir_space_el.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ 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 origin.patch mincore-apply-page-table-walker-on-do_mincore-fix-fix.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