Commit 61351d6d authored by Steve French's avatar Steve French
Browse files

smb3: send backup intent on compounded query info 



When mounting with backupuid set, we should be setting
CREATE_OPEN_BACKUP_INTENT flag on compounded opens as well,
especially the case of compounded smb2_query_path_info.

Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
parent 0cb012d1

fs/cifs/smb2inode.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -293,6 +293,7 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, 
{

{

	int rc;

	int rc;

	struct smb2_file_all_info *smb2_data;

	struct smb2_file_all_info *smb2_data;

	__u32 create_options = 0;





	*adjust_tz = false;

	*adjust_tz = false;

	*symlink = false;

	*symlink = false;
@@ -301,16 +302,20 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, 
			    GFP_KERNEL);

			    GFP_KERNEL);

	if (smb2_data == NULL)

	if (smb2_data == NULL)

		return -ENOMEM;

		return -ENOMEM;

	if (backup_cred(cifs_sb))

		create_options |= CREATE_OPEN_BACKUP_INTENT;





	rc = smb2_compound_op(xid, tcon, cifs_sb, full_path,

	rc = smb2_compound_op(xid, tcon, cifs_sb, full_path,

			      FILE_READ_ATTRIBUTES, FILE_OPEN, 0,

			      FILE_READ_ATTRIBUTES, FILE_OPEN, create_options,

			      smb2_data, SMB2_OP_QUERY_INFO);

			      smb2_data, SMB2_OP_QUERY_INFO);

	if (rc == -EOPNOTSUPP) {

	if (rc == -EOPNOTSUPP) {

		*symlink = true;

		*symlink = true;

		create_options |= OPEN_REPARSE_POINT;



		/* Failed on a symbolic link - query a reparse point info */

		/* Failed on a symbolic link - query a reparse point info */

		rc = smb2_compound_op(xid, tcon, cifs_sb, full_path,

		rc = smb2_compound_op(xid, tcon, cifs_sb, full_path,

				      FILE_READ_ATTRIBUTES, FILE_OPEN,

				      FILE_READ_ATTRIBUTES, FILE_OPEN,

				      OPEN_REPARSE_POINT, smb2_data,

				      create_options, smb2_data,

				      SMB2_OP_QUERY_INFO);

				      SMB2_OP_QUERY_INFO);

	}

	}

	if (rc)

	if (rc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE