diff options
| author | Trond Myklebust <trondmy@gmail.com> | 2020-01-06 19:40:37 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2020-01-22 22:25:41 +0100 |
| commit | 19e0663ff9bce2efb87be8b30f9e46b7843600f3 (patch) | |
| tree | e4efdf22bb6379391f5182a080db731fa855362d /fs/nfsd/nfs4proc.c | |
| parent | nfsd: Ensure sampling of the commit verifier is atomic with the commit (diff) | |
| download | linux-19e0663ff9bce2efb87be8b30f9e46b7843600f3.tar.xz linux-19e0663ff9bce2efb87be8b30f9e46b7843600f3.zip | |
nfsd: Ensure sampling of the write verifier is atomic with the write
When doing an unstable write, we need to ensure that we sample the
write verifier before releasing the lock, and allowing a commit to
the same file to proceed.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index c3455e1b0d50..e4ddaf87493a 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1015,7 +1015,6 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, } write->wr_how_written = write->wr_stable_how; - gen_boot_verifier(&write->wr_verifier, SVC_NET(rqstp)); nvecs = svc_fill_write_vector(rqstp, write->wr_pagelist, &write->wr_head, write->wr_buflen); @@ -1023,7 +1022,8 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfsd_vfs_write(rqstp, &cstate->current_fh, nf, write->wr_offset, rqstp->rq_vec, nvecs, &cnt, - write->wr_how_written); + write->wr_how_written, + (__be32 *)write->wr_verifier.data); nfsd_file_put(nf); write->wr_bytes_written = cnt; |