Commit dc5939de authored by David Howells's avatar David Howells
Browse files

cifs: Replace the writedata replay bool with a netfs sreq flag 



Replace the 'replay' bool in cifs_writedata (now cifs_io_subrequest) with a
flag in the netfs_io_subrequest flags.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Steve French <sfrench@samba.org>
cc: Shyam Prasad N <nspmangalore@gmail.com>
cc: Rohith Surabattula <rohiths.msft@gmail.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: linux-cifs@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
parent 56257334

fs/smb/client/file.c

+1 −1
Original line number Diff line number Diff line
@@ -3325,7 +3325,7 @@ cifs_resend_wdata(struct cifs_io_subrequest *wdata, struct list_head *wdata_list 
			if (wdata->cfile->invalidHandle)

				rc = -EAGAIN;

			else {

				wdata->replay = true;

				set_bit(NETFS_SREQ_RETRYING, &wdata->subreq.flags);

#ifdef CONFIG_CIFS_SMB_DIRECT

				if (wdata->mr) {

					wdata->mr->need_invalidate = true;

fs/smb/client/smb2pdu.c

+2 −2
Original line number Diff line number Diff line
@@ -4832,7 +4832,7 @@ smb2_async_writev(struct cifs_io_subrequest *wdata) 
	struct cifs_io_parms *io_parms = NULL;

	int credit_request;



	if (!wdata->server || wdata->replay)

	if (!wdata->server || test_bit(NETFS_SREQ_RETRYING, &wdata->subreq.flags))

		server = wdata->server = cifs_pick_channel(tcon->ses);



	/*
@@ -4917,7 +4917,7 @@ smb2_async_writev(struct cifs_io_subrequest *wdata) 
	rqst.rq_nvec = 1;

	rqst.rq_iter = wdata->subreq.io_iter;

	rqst.rq_iter_size = iov_iter_count(&rqst.rq_iter);

	if (wdata->replay)

	if (test_bit(NETFS_SREQ_RETRYING, &wdata->subreq.flags))

		smb2_set_replay(server, &rqst);

#ifdef CONFIG_CIFS_SMB_DIRECT

	if (wdata->mr)