Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[~andy/linux] / fs / ocfs2 / namei.c

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index c975eed2e713f1f3562fc541154ab0f74a170858..f4d609be940086794ff8e64b1ed7cd832ba517f5 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -968,7 +968,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;