diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-06-17 19:56:22 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-03 23:02:33 -0400 |
| commit | 2d336687b66cd254c9bdee61b3300d787a8acc1e (patch) | |
| tree | 6d365330c73efd9dfc15f1e88c8258f25fad7c74 /fs | |
| parent | 4533a94725b43a5f3d28b1fe6e37bec743c295f9 (diff) | |
| download | lwn-2d336687b66cd254c9bdee61b3300d787a8acc1e.tar.gz lwn-2d336687b66cd254c9bdee61b3300d787a8acc1e.zip | |
NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes
[ Upstream commit c70701131f7a8edea91fc49d11796d342cff7c62 ]
If a write attempt fails, and the write is queued up for resending to
the server, as opposed to being dropped, then we need to set the
appropriate flag so that nfs_file_fsync() does the right thing.
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/pnfs.c | 1 | ||||
| -rw-r--r-- | fs/nfs/write.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 2b3928794c6b..354f66609316 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1535,6 +1535,7 @@ int pnfs_write_done_resend_to_mds(struct nfs_pgio_header *hdr) /* Resend all requests through the MDS */ nfs_pageio_init_write(&pgio, hdr->inode, FLUSH_STABLE, true, hdr->completion_ops); + set_bit(NFS_CONTEXT_RESEND_WRITES, &hdr->args.context->flags); return nfs_pageio_resend(&pgio, hdr); } EXPORT_SYMBOL_GPL(pnfs_write_done_resend_to_mds); diff --git a/fs/nfs/write.c b/fs/nfs/write.c index f83b02dc9166..6067f2a0b493 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1252,6 +1252,7 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr, static void nfs_redirty_request(struct nfs_page *req) { nfs_mark_request_dirty(req); + set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags); nfs_unlock_request(req); nfs_end_page_writeback(req); nfs_release_request(req); |