Commit 8ef4678f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs fixes from Steve French:
 "Four small cifs/smb3 fixes:

   - two multichannel fixes

   - fix problem noted by kernel test robot

   - update internal version number"

* tag '5.16-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: update internal version number
  smb2: clarify rc initialization in smb2_reconnect
  cifs: populate server_hostname for extra channels
  cifs: nosharesock should be set on new server
parents b501b859 0b03fe6d

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -152,5 +152,5 @@ extern struct dentry *cifs_smb3_do_mount(struct file_system_type *fs_type, 
extern const struct export_operations cifs_export_ops;

#endif /* CONFIG_CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "2.33"

#define CIFS_VERSION   "2.34"

#endif				/* _CIFSFS_H */

fs/cifs/connect.c

+4 −3
Original line number Diff line number Diff line
@@ -1271,10 +1271,8 @@ static int match_server(struct TCP_Server_Info *server, struct smb3_fs_context * 
{

	struct sockaddr *addr = (struct sockaddr *)&ctx->dstaddr;



	if (ctx->nosharesock) {

		server->nosharesock = true;

	if (ctx->nosharesock)

		return 0;

	}



	/* this server does not share socket */

	if (server->nosharesock)
@@ -1438,6 +1436,9 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx, 
		goto out_err;

	}



	if (ctx->nosharesock)

		tcp_ses->nosharesock = true;



	tcp_ses->ops = ctx->ops;

	tcp_ses->vals = ctx->vals;

	cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));

fs/cifs/sess.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ cifs_ses_add_channel(struct cifs_sb_info *cifs_sb, struct cifs_ses *ses, 
	/* Auth */

	ctx.domainauto = ses->domainAuto;

	ctx.domainname = ses->domainName;

	ctx.server_hostname = ses->server->hostname;

	ctx.username = ses->user_name;

	ctx.password = ses->password;

	ctx.sectype = ses->sectype;

fs/cifs/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int 
smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon,

	       struct TCP_Server_Info *server)

{

	int rc;

	int rc = 0;

	struct nls_table *nls_codepage;

	struct cifs_ses *ses;

	int retries;