Commit 929ed21d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 884fe9da fdd7d1ff

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5139,7 +5139,7 @@ X: drivers/clk/clkdev.c 








COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)









M:	Steve French <sfrench@samba.org>









R:	Paulo Alcantara <pc@cjr.nz> (DFS, global name space)









R:	Paulo Alcantara <pc@manguebit.com> (DFS, global name space)









R:	Ronnie Sahlberg <lsahlber@redhat.com> (directory leases, sparse files)









R:	Shyam Prasad N <sprasad@microsoft.com> (multichannel)









R:	Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
































fs/smb/client/ioctl.c



+5
−1






























Original line number
Diff line number
Diff line







@@ -321,7 +321,11 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)







	struct tcon_link *tlink;









	struct cifs_sb_info *cifs_sb;









	__u64	ExtAttrBits = 0;









#ifdef CONFIG_CIFS_POSIX









#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY









	__u64   caps;









#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */









#endif /* CONFIG_CIFS_POSIX */



















	xid = get_xid();


















@@ -331,9 +335,9 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)







			if (pSMBFile == NULL)









				break;









			tcon = tlink_tcon(pSMBFile->tlink);









			caps = le64_to_cpu(tcon->fsUnixInfo.Capability);









#ifdef CONFIG_CIFS_POSIX









#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY









			caps = le64_to_cpu(tcon->fsUnixInfo.Capability);









			if (CIFS_UNIX_EXTATTR_CAP & caps) {









				__u64	ExtAttrMask = 0;









				rc = CIFSGetExtAttr(xid, tcon,
































fs/smb/client/smb2ops.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -618,7 +618,6 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,







		 * Add a new one instead









		 */









		spin_lock(&ses->iface_lock);









		iface = niface = NULL;









		list_for_each_entry_safe(iface, niface, &ses->iface_list,









					 iface_head) {









			ret = iface_cmp(iface, &tmp_iface);
































fs/smb/client/smb2pdu.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -3725,7 +3725,7 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,







		if (*out_data == NULL) {









			rc = -ENOMEM;









			goto cnotify_exit;









		} else









		} else if (plen)









			*plen = le32_to_cpu(smb_rsp->OutputBufferLength);









	}