Skip to content

Commit e099127

Browse files
goldwynrtorvalds
authored andcommitted
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>
1 parent cbab0e4 commit e099127

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/ocfs2/namei.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ static int ocfs2_unlink(struct inode *dir,
947947
ocfs2_free_dir_lookup_result(&orphan_insert);
948948
ocfs2_free_dir_lookup_result(&lookup);
949949

950-
if (status)
950+
if (status && (status != -ENOTEMPTY))
951951
mlog_errno(status);
952952

953953
return status;

0 commit comments

Comments
 (0)