diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2020-03-21 09:27:46 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2020-03-27 16:34:34 -0400 |
| commit | 1f28476dcb98797e838a0c1dd6eae2fda213dd81 (patch) | |
| tree | 52f33d1b249ce67888ead280432aac27d092fc81 /fs/nfs/internal.h | |
| parent | NFS: commit errors should be fatal (diff) | |
| download | linux-dev-1f28476dcb98797e838a0c1dd6eae2fda213dd81.tar.xz linux-dev-1f28476dcb98797e838a0c1dd6eae2fda213dd81.zip | |
NFS: Fix O_DIRECT commit verifier handling
Instead of trying to save the commit verifiers and checking them against
previous writes, adopt the same strategy as for buffered writes, of
just checking the verifiers at commit time.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/internal.h')
| -rw-r--r-- | fs/nfs/internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 3b6fa9edc9b5..6542411c020f 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -544,6 +544,14 @@ nfs_write_verifier_cmp(const struct nfs_write_verifier *v1, return memcmp(v1->data, v2->data, sizeof(v1->data)); } +static inline bool +nfs_write_match_verf(const struct nfs_writeverf *verf, + struct nfs_page *req) +{ + return verf->committed > NFS_UNSTABLE && + !nfs_write_verifier_cmp(&req->wb_verf, &verf->verifier); +} + /* unlink.c */ extern struct rpc_task * nfs_async_rename(struct inode *old_dir, struct inode *new_dir, |