Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d336687 authored by Trond Myklebust's avatar Trond Myklebust Committed by Sasha Levin
Browse files

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: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 4533a947

fs/nfs/pnfs.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

fs/nfs/write.c

+1 −0
Original line number Diff line number Diff line
@@ -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);