From be1176ca6a6c93015fcadfbe7dbc6c8da3e1df8f Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 3 Jan 2006 09:55:33 +0100
Subject: [PATCH] --- yaml --- r: 16626 b: refs/heads/master c:
 24174119c73983d5217da8f56a12c79a9b57e056 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4464c4cb9bf0..5ea76e2f7f0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40859d7ee64ed6bfad8a4e93f9bb5c1074afadff
+refs/heads/master: 24174119c73983d5217da8f56a12c79a9b57e056
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index c0d1a214572c..e9255198f767 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1550,8 +1550,10 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	}
 	nfs_inode_return_delegation(old_inode);
 
-	if (new_inode)
+	if (new_inode != NULL) {
+		nfs_inode_return_delegation(new_inode);
 		d_delete(new_dentry);
+	}
 
 	nfs_begin_data_update(old_dir);
 	nfs_begin_data_update(new_dir);