diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2018-09-25 18:34:43 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2018-09-30 21:35:17 +0200 |
| commit | 1c6c4b740df12f2162ae5c3fac337137e2776236 (patch) | |
| tree | b740c2831b45eeec44849faa86e8d839671846ee /fs/nfs/read.c | |
| parent | NFSv4: Save a few bytes in the nfs_pgio_args/res (diff) | |
| download | linux-1c6c4b740df12f2162ae5c3fac337137e2776236.tar.xz linux-1c6c4b740df12f2162ae5c3fac337137e2776236.zip | |
NFS: Remove private spinlock in struct nfs_pgio_header
Now that each struct nfs_pgio_header corresponds to one RPC call, we
only have one writer to the struct nfs_pgio_header.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/read.c')
| -rw-r--r-- | fs/nfs/read.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 48d7277c60a9..f9f19784db82 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -276,16 +276,14 @@ static void nfs_readpage_result(struct rpc_task *task, struct nfs_pgio_header *hdr) { if (hdr->res.eof) { - loff_t bound; + loff_t pos = hdr->args.offset + hdr->res.count; + unsigned int new = pos - hdr->io_start; - bound = hdr->args.offset + hdr->res.count; - spin_lock(&hdr->lock); - if (bound < hdr->io_start + hdr->good_bytes) { + if (hdr->good_bytes > new) { + hdr->good_bytes = new; set_bit(NFS_IOHDR_EOF, &hdr->flags); clear_bit(NFS_IOHDR_ERROR, &hdr->flags); - hdr->good_bytes = bound - hdr->io_start; } - spin_unlock(&hdr->lock); } else if (hdr->res.count < hdr->args.count) nfs_readpage_retry(task, hdr); } |