| commit | 24174119c73983d5217da8f56a12c79a9b57e056 | [log] [tgz] |
|---|---|---|
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | Tue Jan 03 09:55:33 2006 +0100 |
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | Fri Jan 06 14:58:50 2006 -0500 |
| tree | 38904c36afc94c6833cb9296c705e654ff286e43 | |
| parent | 40859d7ee64ed6bfad8a4e93f9bb5c1074afadff [diff] [blame] |
NFSv4: Ensure that we return the delegation on the target of a rename too. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
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 @@ } 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);