From 218a5f8822ccedc313694adaca745f5791c95650 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 21 Jul 2011 15:49:09 -0400
Subject: [PATCH] --- yaml --- r: 257407 b: refs/heads/master c:
 841590ce16c19a3ce38028adfc8b1955482ee00c h: refs/heads/master i:   257405:
 a0dac1cbf98769714852aaac2b8d836e7f21e0c6   257403:
 f33f40ce23a29ac4ba9540c26d691ca1644ed854   257399:
 a6c7d90c32c077915dbf3f6a5080d4e788ae67a4   257391:
 e1839dd2c1707fc225fde65d90faa2896fbbf57d   257375:
 af62baea252c06282ba926012bbb5dce0005429c   257343:
 8efaec26038fdf48cc459dd323c1b555c99a1c46   257279:
 0a5d2c523cb36e38b8626c23563954c279457f04 v: v3

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

diff --git a/[refs] b/[refs]
index 35c7dcd12fda..b3f5ca7346c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed70afcd6e795e3de98df56f1cd0f898fbf641a7
+refs/heads/master: 841590ce16c19a3ce38028adfc8b1955482ee00c
diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c
index 8f2271a5df53..c18e9a1235b6 100644
--- a/trunk/fs/libfs.c
+++ b/trunk/fs/libfs.c
@@ -328,8 +328,10 @@ int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
 
 	if (new_dentry->d_inode) {
 		simple_unlink(new_dir, new_dentry);
-		if (they_are_dirs)
+		if (they_are_dirs) {
+			drop_nlink(new_dentry->d_inode);
 			drop_nlink(old_dir);
+		}
 	} else if (they_are_dirs) {
 		drop_nlink(old_dir);
 		inc_nlink(new_dir);