Commit e0991271 authored Jun 12, 2013 by Goldwyn Rodrigues Committed by Linus Torvalds Jun 12, 2013

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>

parent cbab0e4e

fs/ocfs2/namei.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -947,7 +947,7 @@ static int ocfs2_unlink(struct inode *dir,
	ocfs2_free_dir_lookup_result(&orphan_insert);		ocfs2_free_dir_lookup_result(&orphan_insert);
	ocfs2_free_dir_lookup_result(&lookup);		ocfs2_free_dir_lookup_result(&lookup);

	if (status)		if (status && (status != -ENOTEMPTY))
	mlog_errno(status);		mlog_errno(status);

	return status;		return status;