Skip to content

Commit ece144f

Browse files
committed
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
2 parents 9d20040 + 66cb85c commit ece144f

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)