diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:20:42 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:20:42 +0300 |
| commit | c1144d29f405ce1f4e6ede6482beb3d0d09750c6 (patch) | |
| tree | 0f9fe36a50005bae6ffe28a4f978e71273f5b1d1 /fs/nfs/unlink.c | |
| parent | d6c70a86bc72fabe7fc9d9533afdb46a56c16896 (diff) | |
| parent | a317e559574b2af62095b39792d168cb98cb2561 (diff) | |
| download | linux-c1144d29f405ce1f4e6ede6482beb3d0d09750c6.tar.xz | |
Merge branch 'for-4.18/alps' into for-linus
hid-alps driver cleanups wrt. t4_read_write_register() handling
from Christophe Jaillet
Diffstat (limited to 'fs/nfs/unlink.c')
| -rw-r--r-- | fs/nfs/unlink.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 630b4a3c1a93..bf54fc9ae135 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c @@ -105,7 +105,7 @@ static void nfs_do_call_unlink(struct nfs_unlinkdata *data) data->args.fh = NFS_FH(dir); nfs_fattr_init(data->res.dir_attr); - NFS_PROTO(dir)->unlink_setup(&msg, dir); + NFS_PROTO(dir)->unlink_setup(&msg, data->dentry); task_setup_data.rpc_client = NFS_CLIENT(dir); task = rpc_run_task(&task_setup_data); @@ -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; |