summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-10-26 08:09:46 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-09 16:23:04 -0800
commit73d1f971858ae19b7b755f244b025dd4ddbfe860 (patch)
tree6d8fdfba22a8e298d71d93011e5f6919b69488ed /fs
parent463cbfdf160340cbc5e91db88546471f697f98d9 (diff)
downloadlwn-73d1f971858ae19b7b755f244b025dd4ddbfe860.tar.gz
lwn-73d1f971858ae19b7b755f244b025dd4ddbfe860.zip
NFSv4: The link() operation should return any delegation on the file
commit 9a3936aac133037f65124fcb2d676a6c201a90a4 upstream. Otherwise, we have to wait for the server to recall it. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/dir.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 32062c33c859..7cb298525eef 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1536,6 +1536,8 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
dentry->d_parent->d_name.name, dentry->d_name.name);
+ nfs_inode_return_delegation(inode);
+
d_drop(dentry);
error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
if (error == 0) {