diff options
| author | David Howells <[email protected]> | 2025-02-25 22:25:00 +0000 |
|---|---|---|
| committer | Steve French <[email protected]> | 2025-02-26 00:35:23 +0000 |
| commit | 66cb85c441cd9c44b193ff75b4d0358fccdc6b9c (patch) | |
| tree | e91d71f6e275286481df3b1a90fd6cefe3277dbc | |
| parent | Linux 6.14-rc4 (diff) | |
| download | kernel-66cb85c441cd9c44b193ff75b4d0358fccdc6b9c.tar.gz kernel-66cb85c441cd9c44b193ff75b4d0358fccdc6b9c.zip | |
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 <[email protected]>
cc: [email protected]
cc: [email protected]
cc: [email protected]
Fixes: e2d46f2ec332 ("netfs: Change the read result collector to only use one work item")
Reported-by: Jean-Christophe Guillain <[email protected]>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219793
Tested-by: Jean-Christophe Guillain <[email protected]>
Tested-by: Pali Rohár <[email protected]>
Reviewed-by: Paulo Alcantara (Red Hat) <[email protected]>
Signed-off-by: David Howells <[email protected]>
Signed-off-by: Steve French <[email protected]>
| -rw-r--r-- | fs/smb/client/cifssmb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c index 3feaa0f68169..d07682020c64 100644 --- 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); } |