From 230a75d9c23935472c95d8205b0a91bfd556bb64 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 27 May 2011 13:42:09 -0700
Subject: [PATCH] --- yaml --- r: 252720 b: refs/heads/master c:
 7ce605d93b775e8a960b0be244f7be565e73b3c1 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/ncpfs/dir.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e72ca9aca801..9e6cf71bd412 100644
--- 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
index e3e646b06404..81c287d105d5 100644
--- 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;