Commit 367bcbc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs client fixes from Steve French:

 - memory leak fix

 - two small cleanups

 - trivial strlcpy removal

 - update missing entry for cifs headers in MAINTAINERS file

* tag '6.0-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: move from strlcpy with unused retval to strscpy
  cifs: Fix memory leak on the deferred close
  cifs: remove useless parameter 'is_fsctl' from SMB2_ioctl()
  cifs: remove unused server parameter from calc_smb_size()
  cifs: missing directory in MAINTAINERS file
parents a0a12c3e 13609a8b

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5145,6 +5145,7 @@ T: git git://git.samba.org/sfrench/cifs-2.6.git 
F:	Documentation/admin-guide/cifs/

F:	fs/cifs/

F:	fs/smbfs_common/

F:	include/uapi/linux/cifs









COMPACTPCI HOTPLUG CORE









M:	Scott Murray <scott@spiteful.org>
































fs/cifs/cifs_debug.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -42,7 +42,7 @@ void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)







		 smb->Command, smb->Status.CifsError,









		 smb->Flags, smb->Flags2, smb->Mid, smb->Pid);









	cifs_dbg(VFS, "smb buf %p len %u\n", smb,









		 server->ops->calc_smb_size(smb, server));









		 server->ops->calc_smb_size(smb));









#endif /* CONFIG_CIFS_DEBUG2 */









}










































fs/cifs/cifsglob.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -417,7 +417,7 @@ struct smb_version_operations {







	int (*close_dir)(const unsigned int, struct cifs_tcon *,









			 struct cifs_fid *);









	/* calculate a size of SMB message */









	unsigned int (*calc_smb_size)(void *buf, struct TCP_Server_Info *ptcpi);









	unsigned int (*calc_smb_size)(void *buf);









	/* check for STATUS_PENDING and process the response if yes */









	bool (*is_status_pending)(char *buf, struct TCP_Server_Info *server);









	/* check for STATUS_NETWORK_SESSION_EXPIRED */
































fs/cifs/cifsproto.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -151,7 +151,7 @@ extern int cifs_get_writable_path(struct cifs_tcon *tcon, const char *name,







extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool);









extern int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,









				  struct cifsFileInfo **ret_file);









extern unsigned int smbCalcSize(void *buf, struct TCP_Server_Info *server);









extern unsigned int smbCalcSize(void *buf);









extern int decode_negTokenInit(unsigned char *security_blob, int length,









			struct TCP_Server_Info *server);









extern int cifs_convert_address(struct sockaddr *dst, const char *src, int len);
































fs/cifs/cifsroot.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -59,7 +59,7 @@ static int __init cifs_root_setup(char *line)







			pr_err("Root-CIFS: UNC path too long\n");









			return 1;









		}









		strlcpy(root_dev, line, len);









		strscpy(root_dev, line, len);









		srvaddr = parse_srvaddr(&line[2], s);









		if (*s) {









			int n = snprintf(root_opts,