diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-01-03 03:55:33 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-01-06 14:58:50 -0500 |
commit | 24174119c73983d5217da8f56a12c79a9b57e056 (patch) | |
tree | 38904c36afc94c6833cb9296c705e654ff286e43 /fs/nfs/dir.c | |
parent | 40859d7ee64ed6bfad8a4e93f9bb5c1074afadff (diff) |
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/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 4 |
1 files changed, 3 insertions, 1 deletions
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: | |||
1550 | } | 1550 | } |
1551 | nfs_inode_return_delegation(old_inode); | 1551 | nfs_inode_return_delegation(old_inode); |
1552 | 1552 | ||
1553 | if (new_inode) | 1553 | if (new_inode != NULL) { |
1554 | nfs_inode_return_delegation(new_inode); | ||
1554 | d_delete(new_dentry); | 1555 | d_delete(new_dentry); |
1556 | } | ||
1555 | 1557 | ||
1556 | nfs_begin_data_update(old_dir); | 1558 | nfs_begin_data_update(old_dir); |
1557 | nfs_begin_data_update(new_dir); | 1559 | nfs_begin_data_update(new_dir); |