Commit ca00c700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull smb client fixes from Steve French:

 - reconnect fix

 - multichannel channel selection fix

 - minor mount warning fix

 - reparse point fix

 - null pointer check improvement

* tag '6.8-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: clarify mount warning
  cifs: handle cases where multiple sessions share connection
  cifs: change tcon status when need_reconnect is set on it
  smb: client: set correct d_type for reparse points under DFS mounts
  smb3: add missing null server pointer check
parents e1e3f530 a5cc98eb

fs/smb/client/connect.c

+11 −0
Original line number Diff line number Diff line
@@ -233,6 +233,12 @@ cifs_mark_tcp_ses_conns_for_reconnect(struct TCP_Server_Info *server, 
	list_for_each_entry_safe(ses, nses, &pserver->smb_ses_list, smb_ses_list) {

		/* check if iface is still active */

		spin_lock(&ses->chan_lock);

		if (cifs_ses_get_chan_index(ses, server) ==

		    CIFS_INVAL_CHAN_INDEX) {

			spin_unlock(&ses->chan_lock);

			continue;

		}



		if (!cifs_chan_is_iface_active(ses, server)) {

			spin_unlock(&ses->chan_lock);

			cifs_chan_update_iface(ses, server);
@@ -4228,6 +4234,11 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru 


	/* only send once per connect */

	spin_lock(&tcon->tc_lock);



	/* if tcon is marked for needing reconnect, update state */

	if (tcon->need_reconnect)

		tcon->status = TID_NEED_TCON;



	if (tcon->status == TID_GOOD) {

		spin_unlock(&tcon->tc_lock);

		return 0;

fs/smb/client/dfs.c

+6 −1
Original line number Diff line number Diff line
@@ -565,6 +565,11 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru 


	/* only send once per connect */

	spin_lock(&tcon->tc_lock);



	/* if tcon is marked for needing reconnect, update state */

	if (tcon->need_reconnect)

		tcon->status = TID_NEED_TCON;



	if (tcon->status == TID_GOOD) {

		spin_unlock(&tcon->tc_lock);

		return 0;
@@ -625,8 +630,8 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru 
		spin_lock(&tcon->tc_lock);

		if (tcon->status == TID_IN_TCON)

			tcon->status = TID_GOOD;

		spin_unlock(&tcon->tc_lock);

		tcon->need_reconnect = false;

		spin_unlock(&tcon->tc_lock);

	}



	return rc;

fs/smb/client/file.c

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon) 


	/* only send once per connect */

	spin_lock(&tcon->tc_lock);

	if (tcon->need_reconnect)

		tcon->status = TID_NEED_RECON;



	if (tcon->status != TID_NEED_RECON) {

		spin_unlock(&tcon->tc_lock);

		return;

fs/smb/client/fs_context.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ cifs_parse_security_flavors(struct fs_context *fc, char *value, struct smb3_fs_c 


	switch (match_token(value, cifs_secflavor_tokens, args)) {

	case Opt_sec_krb5p:

		cifs_errorf(fc, "sec=krb5p is not supported!\n");

		cifs_errorf(fc, "sec=krb5p is not supported. Use sec=krb5,seal instead\n");

		return 1;

	case Opt_sec_krb5i:

		ctx->sign = true;

fs/smb/client/readdir.c

+8 −7
Original line number Diff line number Diff line
@@ -307,14 +307,16 @@ cifs_dir_info_to_fattr(struct cifs_fattr *fattr, FILE_DIRECTORY_INFO *info, 
}



static void cifs_fulldir_info_to_fattr(struct cifs_fattr *fattr,

				       SEARCH_ID_FULL_DIR_INFO *info,

				       const void *info,

				       struct cifs_sb_info *cifs_sb)

{

	const FILE_FULL_DIRECTORY_INFO *di = info;



	__dir_info_to_fattr(fattr, info);



	/* See MS-FSCC 2.4.19 FileIdFullDirectoryInformation */

	/* See MS-FSCC 2.4.14, 2.4.19 */

	if (fattr->cf_cifsattrs & ATTR_REPARSE)

		fattr->cf_cifstag = le32_to_cpu(info->EaSize);

		fattr->cf_cifstag = le32_to_cpu(di->EaSize);

	cifs_fill_common_info(fattr, cifs_sb);

}
@@ -396,7 +398,7 @@ _initiate_cifs_search(const unsigned int xid, struct file *file, 
	} else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {

		cifsFile->srch_inf.info_level = SMB_FIND_FILE_ID_FULL_DIR_INFO;

	} else /* not srvinos - BB fixme add check for backlevel? */ {

		cifsFile->srch_inf.info_level = SMB_FIND_FILE_DIRECTORY_INFO;

		cifsFile->srch_inf.info_level = SMB_FIND_FILE_FULL_DIRECTORY_INFO;

	}



	search_flags = CIFS_SEARCH_CLOSE_AT_END | CIFS_SEARCH_RETURN_RESUME;
@@ -987,10 +989,9 @@ static int cifs_filldir(char *find_entry, struct file *file, 
				       (FIND_FILE_STANDARD_INFO *)find_entry,

				       cifs_sb);

		break;

	case SMB_FIND_FILE_FULL_DIRECTORY_INFO:

	case SMB_FIND_FILE_ID_FULL_DIR_INFO:

		cifs_fulldir_info_to_fattr(&fattr,

					   (SEARCH_ID_FULL_DIR_INFO *)find_entry,

					   cifs_sb);

		cifs_fulldir_info_to_fattr(&fattr, find_entry, cifs_sb);

		break;

	default:

		cifs_dir_info_to_fattr(&fattr,