mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
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>
This commit is contained in:
parent
912678dbc5
commit
f2c2c552f1
6 changed files with 20 additions and 14 deletions
|
@ -386,7 +386,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
|
|||
|
||||
nfs_sb_active(old_dir->i_sb);
|
||||
|
||||
NFS_PROTO(data->old_dir)->rename_setup(&msg, old_dir);
|
||||
NFS_PROTO(data->old_dir)->rename_setup(&msg, old_dentry, new_dentry);
|
||||
|
||||
return rpc_run_task(&task_setup_data);
|
||||
}
|
||||
|
@ -463,9 +463,6 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
|
|||
|
||||
fileid = NFS_FILEID(d_inode(dentry));
|
||||
|
||||
/* Return delegation in anticipation of the rename */
|
||||
NFS_PROTO(d_inode(dentry))->return_delegation(d_inode(dentry));
|
||||
|
||||
sdentry = NULL;
|
||||
do {
|
||||
int slen;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue