summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-10-26 13:09:46 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-10-26 13:09:46 +0100
commit9a3936aac133037f65124fcb2d676a6c201a90a4 (patch)
tree164fa366bf66e5596ff11d24daab4caf5266d27b /fs/nfs
parentNFSv4: Fix two unbalanced put_rpccred() issues. (diff)
downloadlinux-9a3936aac133037f65124fcb2d676a6c201a90a4.tar.xz
linux-9a3936aac133037f65124fcb2d676a6c201a90a4.zip
NFSv4: The link() operation should return any delegation on the file
Otherwise, we have to wait for the server to recall it. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-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) {