From 1139d10728ab6c02d34663d933c83f39d29a9cfd Mon Sep 17 00:00:00 2001
From: Jan Harkes <jaharkes@cs.cmu.edu>
Date: Thu, 19 Jul 2007 01:48:43 -0700
Subject: [PATCH] --- yaml --- r: 61619 b: refs/heads/master c:
 8c6d21528406ec719aaea9d589876fd105c31646 h: refs/heads/master i:   61617:
 a4e67fa3d95c8244e6c65518aef7c5a6dfa6ccea   61615:
 b7bdd255f8de9cf6df6f63776c9f97575e435198 v: v3

---
 [refs]              |  2 +-
 trunk/fs/coda/dir.c | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 94cbcd44a692..9b92b21bf2df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d728900cd5502927158db747c653007cf72e2e49
+refs/heads/master: 8c6d21528406ec719aaea9d589876fd105c31646
diff --git a/trunk/fs/coda/dir.c b/trunk/fs/coda/dir.c
index 56a3b76b91ca..01f55f447d82 100644
--- a/trunk/fs/coda/dir.c
+++ b/trunk/fs/coda/dir.c
@@ -391,28 +391,23 @@ int coda_rmdir(struct inode *dir, struct dentry *de)
 {
 	const char *name = de->d_name.name;
 	int len = de->d_name.len;
-        int error;
+	int error;
 
 	lock_kernel();
 	coda_vfs_stat.rmdir++;
 
-	if (!d_unhashed(de)) {
-		unlock_kernel();
-		return -EBUSY;
-	}
 	error = venus_rmdir(dir->i_sb, coda_i2f(dir), name, len);
+	if (!error) {
+		/* VFS may delete the child */
+		if (de->d_inode)
+		    de->d_inode->i_nlink = 0;
 
-	if ( error ) {
-		unlock_kernel();
-		return error;
+		/* fix the link count of the parent */
+		coda_dir_drop_nlink(dir);
+		coda_dir_update_mtime(dir);
 	}
-
-	coda_dir_drop_nlink(dir);
-	coda_dir_update_mtime(dir);
-	drop_nlink(de->d_inode);
-	d_delete(de);
 	unlock_kernel();
-	return 0;
+	return error;
 }
 
 /* rename */