Commit 66cb85c4 authored by David Howells's avatar David Howells Committed by Steve French
Browse files

cifs: Fix the smb1 readv callback to correctly call netfs 



Fix cifs_readv_callback() to call netfs_read_subreq_terminated() rather
than queuing the subrequest work item (which is unset).  Also call the
I/O progress tracepoint.

cc: Jeff Layton <jlayton@kernel.org>
cc: linux-cifs@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Fixes: e2d46f2e ("netfs: Change the read result collector to only use one work item")
Reported-by: default avatarJean-Christophe Guillain <jean-christophe@guillain.net>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219793


Tested-by: default avatarJean-Christophe Guillain <jean-christophe@guillain.net>
Tested-by: default avatarPali Rohár <pali@kernel.org>
Reviewed-by: default avatarPaulo Alcantara (Red Hat) <pc@manguebit.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent d082ecbc

fs/smb/client/cifssmb.c

+2 −1
Original line number Diff line number Diff line
@@ -1338,7 +1338,8 @@ cifs_readv_callback(struct mid_q_entry *mid) 
	rdata->credits.value = 0;

	rdata->subreq.error = rdata->result;

	rdata->subreq.transferred += rdata->got_bytes;

	queue_work(cifsiod_wq, &rdata->subreq.work);

	trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_progress);

	netfs_read_subreq_terminated(&rdata->subreq);

	release_mid(mid);

	add_credits(server, &credits, 0);

}