diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2018-03-20 16:43:16 -0400 |
---|---|---|
committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2018-04-10 16:06:22 -0400 |
commit | f2c2c552f119db84d85a53a8bd76479f34df02b1 (patch) | |
tree | a280fb60144a23f872b3fc3ffae365c4ed6abaa3 /fs/nfs/dir.c | |
parent | 912678dbc592db7ad618f383866ad23e43cd51f3 (diff) |
NFS: Move delegation recall into the NFSv4 callback for rename_setup()
Move the delegation recall out of the generic code, and into the NFSv4
specific callback.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index eb9d782ed674..8001f8c7ad0e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -2020,10 +2020,6 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
2020 | } | 2020 | } |
2021 | } | 2021 | } |
2022 | 2022 | ||
2023 | NFS_PROTO(old_inode)->return_delegation(old_inode); | ||
2024 | if (new_inode != NULL) | ||
2025 | NFS_PROTO(new_inode)->return_delegation(new_inode); | ||
2026 | |||
2027 | task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL); | 2023 | task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL); |
2028 | if (IS_ERR(task)) { | 2024 | if (IS_ERR(task)) { |
2029 | error = PTR_ERR(task); | 2025 | error = PTR_ERR(task); |