summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoldwyn Rodrigues <rgoldwyn@gmail.com>2013-06-12 14:04:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-12 16:29:45 -0700
commite099127169429c19544a8f55dd26937fddd5b1f4 (patch)
treee06d265b5304ca1ea6b28716f9a685c48096935c
parentcbab0e4eec299e9059199ebe6daf48730be46d2b (diff)
downloadlinux-stable-e099127169429c19544a8f55dd26937fddd5b1f4.tar.gz
linux-stable-e099127169429c19544a8f55dd26937fddd5b1f4.tar.bz2
linux-stable-e099127169429c19544a8f55dd26937fddd5b1f4.zip
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@suse.com> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Acked-by: Sunil Mushran <sunil.mushran@gmail.com> Reviewed-by: Jie Liu <jeff.liu@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ocfs2/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index b563351753f1..b4a5cdf9dbc5 100644
--- a/fs/ocfs2/namei.c
+++ b/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;