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: e2d46f2ec332 ("netfs: Change the read result collector to only use one work item")
Reported-by: Jean-Christophe Guillain <jean-christophe@guillain.net>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219793
Tested-by: Jean-Christophe Guillain <jean-christophe@guillain.net>
Tested-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Paulo Alcantara (Red Hat) <pc@manguebit.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index 3feaa0f6816999d9d3e0d89abd1ca011c34f5bea..d07682020c645d7ffe604faa6cb94dba7101f45c 100644 (file)
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -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);
 }