On Wed, 17 Jun 2015 20:02:51 -0400
Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxxx
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> ---
> fs/nfs/pnfs.c | 1 +
> fs/nfs/write.c | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
> index 219ee6a3f1b3..d47c188682b1 100644
> --- a/fs/nfs/pnfs.c
> +++ b/fs/nfs/pnfs.c
> @@ -1821,6 +1821,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 dfc19f1575a1..daf355642845 100644
> --- a/fs/nfs/write.c
> +++ b/fs/nfs/write.c
> @@ -1289,6 +1289,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);
Looks right.
Reviewed-by: Jeff Layton <jeff.layton@xxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
