diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-01 16:10:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-01 16:10:31 -0800 |
| commit | ece144f151ac7bf8bb5b98f7d4aeeda7a2eed02a (patch) | |
| tree | 59acdfb94784da420a137bb53c70b62ff3c82b9b | |
| parent | 9d20040d71ede4c0e5fc6ae7aaa92788de1e713a (diff) | |
| parent | 66cb85c441cd9c44b193ff75b4d0358fccdc6b9c (diff) | |
Merge tag 'v6.14-rc4-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6
Pull smb client fix from Steve French:
"Fix SMB1 netfs client regression"
* tag 'v6.14-rc4-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Fix the smb1 readv callback to correctly call netfs
| -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); } |