From: Trond Myklebust <trond.myklebust@primarydata.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v4 08/17] NFS: Fix O_DIRECT verifier problems
Date: Thu, 23 Jun 2016 16:00:40 -0400 [thread overview]
Message-ID: <1466712049-5326-8-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1466712049-5326-7-git-send-email-trond.myklebust@primarydata.com>
We should not be interested in looking at the value of the stable field,
since that could take any value.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/direct.c | 10 ++++++++--
fs/nfs/internal.h | 7 +++++++
fs/nfs/write.c | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 979b3c4dee6a..d6d43b5eafb3 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -196,6 +196,12 @@ static void nfs_direct_set_hdr_verf(struct nfs_direct_req *dreq,
WARN_ON_ONCE(verfp->committed < 0);
}
+static int nfs_direct_cmp_verf(const struct nfs_writeverf *v1,
+ const struct nfs_writeverf *v2)
+{
+ return nfs_write_verifier_cmp(&v1->verifier, &v2->verifier);
+}
+
/*
* nfs_direct_cmp_hdr_verf - compare verifier for pgio header
* @dreq - direct request possibly spanning multiple servers
@@ -215,7 +221,7 @@ static int nfs_direct_set_or_cmp_hdr_verf(struct nfs_direct_req *dreq,
nfs_direct_set_hdr_verf(dreq, hdr);
return 0;
}
- return memcmp(verfp, &hdr->verf, sizeof(struct nfs_writeverf));
+ return nfs_direct_cmp_verf(verfp, &hdr->verf);
}
/*
@@ -238,7 +244,7 @@ static int nfs_direct_cmp_commit_data_verf(struct nfs_direct_req *dreq,
if (verfp->committed < 0)
return 1;
- return memcmp(verfp, &data->verf, sizeof(struct nfs_writeverf));
+ return nfs_direct_cmp_verf(verfp, &data->verf);
}
/**
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 5154fa65a2f2..150a8eb0f323 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -506,6 +506,13 @@ extern int nfs_migrate_page(struct address_space *,
#define nfs_migrate_page NULL
#endif
+static inline int
+nfs_write_verifier_cmp(const struct nfs_write_verifier *v1,
+ const struct nfs_write_verifier *v2)
+{
+ return memcmp(v1->data, v2->data, sizeof(v1->data));
+}
+
/* unlink.c */
extern struct rpc_task *
nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index b13d48881d3a..3087fb6f1983 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1789,7 +1789,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
/* Okay, COMMIT succeeded, apparently. Check the verifier
* returned by the server against all stored verfs. */
- if (!memcmp(&req->wb_verf, &data->verf.verifier, sizeof(req->wb_verf))) {
+ if (!nfs_write_verifier_cmp(&req->wb_verf, &data->verf.verifier)) {
/* We have a match */
nfs_inode_remove_request(req);
dprintk(" OK\n");
--
2.7.4
next prev parent reply other threads:[~2016-06-23 20:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 20:00 [PATCH v4 01/17] NFS: Don't flush caches for a getattr that races with writeback Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 02/17] NFS: Cache access checks more aggressively Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 03/17] NFS: Cache aggressively when file is open for writing Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 04/17] NFS: Kill NFS_INO_NFS_INO_FLUSHING: it is a performance killer Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 05/17] NFS: writepage of a single page should not be synchronous Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 06/17] NFS: Don't hold the inode lock across fsync() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 07/17] NFS: Don't call COMMIT in ->releasepage() Trond Myklebust
2016-06-23 20:00 ` Trond Myklebust [this message]
2016-06-23 20:00 ` [PATCH v4 09/17] NFS: Ensure we reset the write verifier 'committed' value on resend Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 10/17] NFS: Remove racy size manipulations in O_DIRECT Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 11/17] NFS Cleanup: move call to generic_write_checks() into fs/nfs/direct.c Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 12/17] NFS: Move buffered I/O locking into nfs_file_write() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 13/17] NFS: Do not serialise O_DIRECT reads and writes Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 14/17] NFS: Cleanup nfs_direct_complete() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 15/17] NFS: Remove redundant waits for O_DIRECT in fsync() and write_begin() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 16/17] NFS: Remove unused function nfs_revalidate_mapping_protected() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 17/17] NFS nfs_vm_page_mkwrite: Don't freeze me, Bro Trond Myklebust
2016-06-28 12:12 ` [PATCH v4 01/17] NFS: Don't flush caches for a getattr that races with writeback Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466712049-5326-8-git-send-email-trond.myklebust@primarydata.com \
--to=trond.myklebust@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).