aboutsummaryrefslogtreecommitdiff
path: root/fs/nfsd/vfs.h
diff options
context:
space:
mode:
authorGravatar Trond Myklebust <trondmy@gmail.com> 2020-01-06 13:40:37 -0500
committerGravatar J. Bruce Fields <bfields@redhat.com> 2020-01-22 16:25:41 -0500
commit19e0663ff9bce2efb87be8b30f9e46b7843600f3 (patch)
treee4efdf22bb6379391f5182a080db731fa855362d /fs/nfsd/vfs.h
parentnfsd: Ensure sampling of the commit verifier is atomic with the commit (diff)
downloadlinux-19e0663ff9bce2efb87be8b30f9e46b7843600f3.tar.gz
linux-19e0663ff9bce2efb87be8b30f9e46b7843600f3.tar.bz2
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/vfs.h')
-rw-r--r--fs/nfsd/vfs.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index d23d9daacc3d..3eb660ad80d1 100644
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -94,11 +94,12 @@ __be32 nfsd_read(struct svc_rqst *, struct svc_fh *,
loff_t, struct kvec *, int, unsigned long *,
u32 *eof);
__be32 nfsd_write(struct svc_rqst *, struct svc_fh *, loff_t,
- struct kvec *, int, unsigned long *, int);
+ struct kvec *, int, unsigned long *,
+ int stable, __be32 *verf);
__be32 nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,
struct nfsd_file *nf, loff_t offset,
struct kvec *vec, int vlen, unsigned long *cnt,
- int stable);
+ int stable, __be32 *verf);
__be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *,
char *, int *);
__be32 nfsd_symlink(struct svc_rqst *, struct svc_fh *,