Skip to content

Commit 66cb85c

Browse files
dhowellsSteve French
authored andcommitted
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: e2d46f2 ("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>
1 parent d082ecb commit 66cb85c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/smb/client/cifssmb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,8 @@ cifs_readv_callback(struct mid_q_entry *mid)
13381338
rdata->credits.value = 0;
13391339
rdata->subreq.error = rdata->result;
13401340
rdata->subreq.transferred += rdata->got_bytes;
1341-
queue_work(cifsiod_wq, &rdata->subreq.work);
1341+
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_progress);
1342+
netfs_read_subreq_terminated(&rdata->subreq);
13421343
release_mid(mid);
13431344
add_credits(server, &credits, 0);
13441345
}

0 commit comments

Comments
 (0)