summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-03 09:55:33 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-06 14:58:50 -0500
commit24174119c73983d5217da8f56a12c79a9b57e056 (patch)
tree38904c36afc94c6833cb9296c705e654ff286e43 /fs/nfs
parent40859d7ee64ed6bfad8a4e93f9bb5c1074afadff (diff)
downloadop-kernel-dev-24174119c73983d5217da8f56a12c79a9b57e056.zip
op-kernel-dev-24174119c73983d5217da8f56a12c79a9b57e056.tar.gz
NFSv4: Ensure that we return the delegation on the target of a rename too.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/dir.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index c0d1a21..e925519 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);
OpenPOWER on IntegriCloud