tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag '6.10-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull smb client fixes from Steve French:
"Two small smb3 client fixes:

- fix deadlock in umount

- minor cleanup due to netfs change"

* tag '6.10-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Don't advance the I/O iterator before terminating subrequest
smb: client: fix deadlock in smb2_find_smb_tcon()

Linus Torvalds c5dbc2ed 061d1af7

+1 -4
-3
fs/smb/client/smb2pdu.c
··· 4577 4577 if (rdata->subreq.start < rdata->subreq.rreq->i_size) 4578 4578 rdata->result = 0; 4579 4579 } 4580 - if (rdata->result == 0 || rdata->result == -EAGAIN) 4581 - iov_iter_advance(&rdata->subreq.io_iter, rdata->got_bytes); 4582 4580 rdata->credits.value = 0; 4583 4581 netfs_subreq_terminated(&rdata->subreq, 4584 4582 (rdata->result == 0 || rdata->result == -EAGAIN) ? ··· 4787 4789 wdata->result = -ENOSPC; 4788 4790 else 4789 4791 wdata->subreq.len = written; 4790 - iov_iter_advance(&wdata->subreq.io_iter, written); 4791 4792 break; 4792 4793 case MID_REQUEST_SUBMITTED: 4793 4794 case MID_RETRY_NEEDED:
+1 -1
fs/smb/client/smb2transport.c
··· 216 216 } 217 217 tcon = smb2_find_smb_sess_tcon_unlocked(ses, tid); 218 218 if (!tcon) { 219 - cifs_put_smb_ses(ses); 220 219 spin_unlock(&cifs_tcp_ses_lock); 220 + cifs_put_smb_ses(ses); 221 221 return NULL; 222 222 } 223 223 spin_unlock(&cifs_tcp_ses_lock);