Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag '6.13-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull smb client fixes from Steve French:
- fix rmmod leak
- two minor cleanups
- fix for unlink/rename with pending i/o
* tag '6.13-rc2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
smb: client: destroy cfid_put_wq on module exit
cifs: Use str_yes_no() helper in cifs_ses_add_channel()
cifs: Fix rmdir failure due to ongoing I/O on deleted file
smb3: fix compiler warning in reparse code
+8
-4
+1
fs/smb/client/cifsfs.c
+1
fs/smb/client/cifsfs.c
+4
-1
fs/smb/client/inode.c
+4
-1
fs/smb/client/inode.c
···
1947
1947
goto unlink_out;
1948
1948
}
1949
1949
1950
+
netfs_wait_for_outstanding_io(inode);
1950
1951
cifs_close_deferred_file_under_dentry(tcon, full_path);
1951
1952
#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
1952
1953
if (cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &
···
2465
2464
}
2466
2465
2467
2466
cifs_close_deferred_file_under_dentry(tcon, from_name);
2468
-
if (d_inode(target_dentry) != NULL)
2467
+
if (d_inode(target_dentry) != NULL) {
2468
+
netfs_wait_for_outstanding_io(d_inode(target_dentry));
2469
2469
cifs_close_deferred_file_under_dentry(tcon, to_name);
2470
+
}
2470
2471
2471
2472
rc = cifs_do_rename(xid, source_dentry, from_name, target_dentry,
2472
2473
to_name);
+1
-1
fs/smb/client/reparse.c
+1
-1
fs/smb/client/reparse.c
···
676
676
return -ENOMEM;
677
677
symname_utf16_len = utf8s_to_utf16s(buf->PathBuffer, symname_utf8_len,
678
678
UTF16_LITTLE_ENDIAN,
679
-
symname_utf16, symname_utf8_len * 2);
679
+
(wchar_t *) symname_utf16, symname_utf8_len * 2);
680
680
if (symname_utf16_len < 0) {
681
681
kfree(symname_utf16);
682
682
return symname_utf16_len;
+2
-2
fs/smb/client/sess.c
+2
-2
fs/smb/client/sess.c
···
488
488
489
489
if (iface->sockaddr.ss_family == AF_INET)
490
490
cifs_dbg(FYI, "adding channel to ses %p (speed:%zu bps rdma:%s ip:%pI4)\n",
491
-
ses, iface->speed, iface->rdma_capable ? "yes" : "no",
491
+
ses, iface->speed, str_yes_no(iface->rdma_capable),
492
492
&ipv4->sin_addr);
493
493
else
494
494
cifs_dbg(FYI, "adding channel to ses %p (speed:%zu bps rdma:%s ip:%pI6)\n",
495
-
ses, iface->speed, iface->rdma_capable ? "yes" : "no",
495
+
ses, iface->speed, str_yes_no(iface->rdma_capable),
496
496
&ipv6->sin6_addr);
497
497
498
498
/*