---

yaml --- r: 252720 b: refs/heads/master c: 7ce605d h: refs/heads/master v: v3
git-mirror · May 28, 2011 · 230a75d · 230a75d
1 parent 1f1ec06
commit 230a75d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55e5b7e022eaaa805a44e3b6ecd5c8638d862050
+refs/heads/master: 7ce605d93b775e8a960b0be244f7be565e73b3c1
diff --git a/trunk/fs/ncpfs/dir.c b/trunk/fs/ncpfs/dir.c
@@ -1033,8 +1033,11 @@ static int ncp_rmdir(struct inode *dir, struct dentry *dentry)
 	DPRINTK("ncp_rmdir: removing %s/%s\n",
 		dentry->d_parent->d_name.name, dentry->d_name.name);
 
+	/*
+	 * fail with EBUSY if there are still references to this
+	 * directory.
+	 */
 	dentry_unhash(dentry);
-
 	error = -EBUSY;
 	if (!d_unhashed(dentry))
 		goto out;