Subject: [merged] fs-ocfs2-nameic-remove-unecessary-error-when-removing-non-empty-directory.patch removed from -mm tree To: rgoldwyn@xxxxxxxxx,jeff.liu@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,rgoldwyn@xxxxxxxx,sunil.mushran@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 13 Jun 2013 11:57:46 -0700 The patch titled Subject: fs/ocfs2/namei.c: remove unecessary ERROR when removing non-empty directory has been removed from the -mm tree. Its filename was fs-ocfs2-nameic-remove-unecessary-error-when-removing-non-empty-directory.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Goldwyn Rodrigues <rgoldwyn@xxxxxxxxx> Subject: fs/ocfs2/namei.c: remove unecessary ERROR when removing non-empty directory While removing a non-empty directory, the kernel dumps a message: (rmdir,21743,1):ocfs2_unlink:953 ERROR: status = -39 Suppress the error message from being printed in the dmesg so users don't panic. Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Acked-by: Sunil Mushran <sunil.mushran@xxxxxxxxx> Reviewed-by: Jie Liu <jeff.liu@xxxxxxxxxx> 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~fs-ocfs2-nameic-remove-unecessary-error-when-removing-non-empty-directory fs/ocfs2/namei.c --- a/fs/ocfs2/namei.c~fs-ocfs2-nameic-remove-unecessary-error-when-removing-non-empty-directory +++ a/fs/ocfs2/namei.c @@ -947,7 +947,7 @@ leave: ocfs2_free_dir_lookup_result(&orphan_insert); ocfs2_free_dir_lookup_result(&lookup); - if (status) + if (status && (status != -ENOTEMPTY)) mlog_errno(status); return status; _ Patches currently in -mm which might be from rgoldwyn@xxxxxxxxx are origin.patch ocfs2-remove-unecessary-variable-needs_checkpoint.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