diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2018-05-04 22:22:48 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2018-05-31 21:02:16 +0200 |
| commit | fb91fb0ee7b266ed0344515c048f57ac65cdb4b4 (patch) | |
| tree | 658910cabf1cc7b865056840336aa36a3582b470 /fs/nfs/write.c | |
| parent | NFS: Avoid quadratic search when freeing delegations. (diff) | |
| download | linux-fb91fb0ee7b266ed0344515c048f57ac65cdb4b4.tar.xz linux-fb91fb0ee7b266ed0344515c048f57ac65cdb4b4.zip | |
NFS: Move call to nfs4_state_protect_write() to nfs4_write_setup()
This doesn't really need to be in the generic NFS client code, and I
think it makes more sense to keep the v4 code in one place.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 0193053bc139..b633583ca268 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1375,12 +1375,9 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr, int priority = flush_task_priority(how); task_setup_data->priority = priority; - rpc_ops->write_setup(hdr, msg); + rpc_ops->write_setup(hdr, msg, &task_setup_data->rpc_client); trace_nfs_initiate_write(hdr->inode, hdr->io_start, hdr->good_bytes, hdr->args.stable); - - nfs4_state_protect_write(NFS_SERVER(hdr->inode)->nfs_client, - &task_setup_data->rpc_client, msg, hdr); } /* If a nfs_flush_* function fails, it should remove reqs from @head and |