From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 4 Nov 2005 20:35:02 +0000 (-0500)
Subject: NFSv4: Return any delegations before sillyrenaming the file
X-Git-Tag: v2.6.15-rc1~452^2~18
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34ea818846e6cccdd6e05354ab8c8a6d7e34657a;p=linux-2.6

NFSv4: Return any delegations before sillyrenaming the file

 I missed this one... Any form of rename will result in a delegation
 recall, so it is more efficient to return the one we hold before
 trying the rename.

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

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 8272ed3fc7..7370583b61 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1257,6 +1257,9 @@ dentry->d_parent->d_name.name, dentry->d_name.name);
 	sprintf(silly, ".nfs%*.*lx",
 		i_inosize, i_inosize, dentry->d_inode->i_ino);
 
+	/* Return delegation in anticipation of the rename */
+	nfs_inode_return_delegation(dentry->d_inode);
+
 	sdentry = NULL;
 	do {
 		char *suffix = silly + slen - countersize;