Subject: [merged] ocfs2-do-not-log-enoent-in-unlink.patch removed from -mm tree To: xiaowei.hu@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,joe.jin@xxxxxxxxxx,mfasheh@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 28 Jan 2014 11:09:13 -0800 The patch titled Subject: ocfs2: do not log ENOENT in unlink() has been removed from the -mm tree. Its filename was ocfs2-do-not-log-enoent-in-unlink.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: "Xiaowei.Hu" <xiaowei.hu@xxxxxxxxxx> Subject: ocfs2: do not log ENOENT in unlink() Suppress log message like this: (open_delete,8328,0):ocfs2_unlink:951 ERROR: status = -2 Orabug:17445485 Signed-off-by: Xiaowei Hu <xiaowei.hu@xxxxxxxxxx> Cc: Joe Jin <joe.jin@xxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ocfs2/namei.c~ocfs2-do-not-log-enoent-in-unlink fs/ocfs2/namei.c --- a/fs/ocfs2/namei.c~ocfs2-do-not-log-enoent-in-unlink +++ a/fs/ocfs2/namei.c @@ -948,7 +948,7 @@ leave: ocfs2_free_dir_lookup_result(&orphan_insert); ocfs2_free_dir_lookup_result(&lookup); - if (status && (status != -ENOTEMPTY)) + if (status && (status != -ENOTEMPTY) && (status != -ENOENT)) mlog_errno(status); return status; _ Patches currently in -mm which might be from xiaowei.hu@xxxxxxxxxx are origin.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