From eadd262e35bf5d92b14bb0fd3356f379ea8d409d Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@tuxera.com>
Date: Wed, 27 Oct 2010 13:45:50 +0200
Subject: [PATCH] --- yaml --- r: 218966 b: refs/heads/master c:
 85b8fe8cc47b0dc1068475ba95f29ddff10a8efc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d3a7fec4ac87..b09f5961214a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e50fb58b5b3548e578d3b74ff15aeb7d9a496839
+refs/heads/master: 85b8fe8cc47b0dc1068475ba95f29ddff10a8efc
diff --git a/trunk/fs/hfsplus/dir.c b/trunk/fs/hfsplus/dir.c
index d236d85ec9d7..e490aaf35174 100644
--- a/trunk/fs/hfsplus/dir.c
+++ b/trunk/fs/hfsplus/dir.c
@@ -317,8 +317,10 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
 		res = hfsplus_rename_cat(inode->i_ino,
 					 dir, &dentry->d_name,
 					 sbi->hidden_dir, &str);
-		if (!res)
+		if (!res) {
 			inode->i_flags |= S_DEAD;
+			drop_nlink(inode);
+		}
 		goto out;
 	}
 	res = hfsplus_delete_cat(cnid, dir, &dentry->d_name);