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.4-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

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

- two small fixes suggested by kernel test robot

- small cleanup fix

- update Paulo's email address in the maintainer file"

* tag '6.4-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
cifs: address unused variable warning
smb: delete an unnecessary statement
smb3: missing null check in SMB2_change_notify
smb3: update a reviewer email in MAINTAINERS file

+7 -4
+1 -1
MAINTAINERS
··· 5139 5139 5140 5140 COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3) 5141 5141 M: Steve French <sfrench@samba.org> 5142 - R: Paulo Alcantara <pc@cjr.nz> (DFS, global name space) 5142 + R: Paulo Alcantara <pc@manguebit.com> (DFS, global name space) 5143 5143 R: Ronnie Sahlberg <lsahlber@redhat.com> (directory leases, sparse files) 5144 5144 R: Shyam Prasad N <sprasad@microsoft.com> (multichannel) 5145 5145 R: Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
+5 -1
fs/smb/client/ioctl.c
··· 321 321 struct tcon_link *tlink; 322 322 struct cifs_sb_info *cifs_sb; 323 323 __u64 ExtAttrBits = 0; 324 + #ifdef CONFIG_CIFS_POSIX 325 + #ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY 324 326 __u64 caps; 327 + #endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ 328 + #endif /* CONFIG_CIFS_POSIX */ 325 329 326 330 xid = get_xid(); 327 331 ··· 335 331 if (pSMBFile == NULL) 336 332 break; 337 333 tcon = tlink_tcon(pSMBFile->tlink); 338 - caps = le64_to_cpu(tcon->fsUnixInfo.Capability); 339 334 #ifdef CONFIG_CIFS_POSIX 340 335 #ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY 336 + caps = le64_to_cpu(tcon->fsUnixInfo.Capability); 341 337 if (CIFS_UNIX_EXTATTR_CAP & caps) { 342 338 __u64 ExtAttrMask = 0; 343 339 rc = CIFSGetExtAttr(xid, tcon,
-1
fs/smb/client/smb2ops.c
··· 618 618 * Add a new one instead 619 619 */ 620 620 spin_lock(&ses->iface_lock); 621 - iface = niface = NULL; 622 621 list_for_each_entry_safe(iface, niface, &ses->iface_list, 623 622 iface_head) { 624 623 ret = iface_cmp(iface, &tmp_iface);
+1 -1
fs/smb/client/smb2pdu.c
··· 3725 3725 if (*out_data == NULL) { 3726 3726 rc = -ENOMEM; 3727 3727 goto cnotify_exit; 3728 - } else 3728 + } else if (plen) 3729 3729 *plen = le32_to_cpu(smb_rsp->OutputBufferLength); 3730 3730 } 3731 3731