---

yaml --- r: 376968 b: refs/heads/master c: e099127 h: refs/heads/master v: v3
git-mirror · Jun 12, 2013 · 47d33ba · 47d33ba
1 parent 52f1f6d
commit 47d33ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbab0e4eec299e9059199ebe6daf48730be46d2b
+refs/heads/master: e099127169429c19544a8f55dd26937fddd5b1f4
diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c
@@ -947,7 +947,7 @@ static int ocfs2_unlink(struct inode *dir,
 	ocfs2_free_dir_lookup_result(&orphan_insert);
 	ocfs2_free_dir_lookup_result(&lookup);
 
-	if (status)
+	if (status && (status != -ENOTEMPTY))
 		mlog_errno(status);
 
 	return status;