From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 3 Jan 2006 08:55:33 +0000 (+0100)
Subject: NFSv4: Ensure that we return the delegation on the target of a rename too.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=24174119c73983d5217da8f56a12c79a9b57e056;p=openwrt%2Fstaging%2Fblogic.git

NFSv4: Ensure that we return the delegation on the target of a rename too.

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index c0d1a214572c..e9255198f767 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1550,8 +1550,10 @@ go_ahead:
 	}
 	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);