From: Trond Myklebust <trond.myklebust@primarydata.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v4 09/17] NFS: Ensure we reset the write verifier 'committed' value on resend.
Date: Thu, 23 Jun 2016 16:00:41 -0400 [thread overview]
Message-ID: <1466712049-5326-9-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1466712049-5326-8-git-send-email-trond.myklebust@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/direct.c | 2 ++
fs/nfs/internal.h | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index d6d43b5eafb3..fb659bb50678 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -661,6 +661,8 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo);
dreq->count = 0;
+ dreq->verf.committed = NFS_INVALID_STABLE_HOW;
+ nfs_clear_pnfs_ds_commit_verifiers(&dreq->ds_cinfo);
for (i = 0; i < dreq->mirror_count; i++)
dreq->mirrors[i].count = 0;
get_dreq(dreq);
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 150a8eb0f323..0eb5c924886d 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -499,6 +499,23 @@ int nfs_key_timeout_notify(struct file *filp, struct inode *inode);
bool nfs_ctx_key_to_expire(struct nfs_open_context *ctx);
void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio);
+#ifdef CONFIG_NFS_V4_1
+static inline
+void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo)
+{
+ int i;
+
+ for (i = 0; i < cinfo->nbuckets; i++)
+ cinfo->buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW;
+}
+#else
+static inline
+void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo)
+{
+}
+#endif
+
+
#ifdef CONFIG_MIGRATION
extern int nfs_migrate_page(struct address_space *,
struct page *, struct page *, enum migrate_mode);
--
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 ` [PATCH v4 08/17] NFS: Fix O_DIRECT verifier problems Trond Myklebust
2016-06-23 20:00 ` Trond Myklebust [this message]
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-9-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).