Add protocol specific operation for CIFS xattrs (d979f3b0) · Commits · 戴 / test

Changeset added protocol operations for get/setxattr to avoid calling cifs operations on smb2/smb3 mounts for xattr operations and this changeset adds the calls to cifs specific protocol operations for xattrs (in order to reenable cifs support for xattrs which was temporarily disabled by the previous changeset. We do not have SMB2/SMB3 worker function for setting xattrs yet so this only enables it for cifs. CCing stable since without these two small changsets (its small coreq is also needed) calling getfattr/setfattr on smb2/smb3 mounts causes problems. Signed-off-by:

Steve French <smfrench@gmail.com> Reviewed-by:

Shirish Pargaonkar <spargaonkar@suse.com> CC: Stable <stable@kernel.org>

fs/cifs/inode.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -527,10 +527,15 @@ static int cifs_sfu_mode(struct cifs_fattr fattr, const unsigned char path,
		return PTR_ERR(tlink);
		tcon = tlink_tcon(tlink);

		rc = CIFSSMBQAllEAs(xid, tcon, path, "SETFILEBITS",
		ea_value, 4 /* size of buf */, cifs_sb->local_nls,
		cifs_sb->mnt_cifs_flags &
		CIFS_MOUNT_MAP_SPECIAL_CHR);
		if (tcon->ses->server->ops->query_all_EAs == NULL) {
		cifs_put_tlink(tlink);
		return -EOPNOTSUPP;
		}

		rc = tcon->ses->server->ops->query_all_EAs(xid, tcon, path,
		"SETFILEBITS", ea_value, 4 /* size of buf */,
		cifs_sb->local_nls,
		cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
		cifs_put_tlink(tlink);
		if (rc < 0)
		return (int)rc;

fs/cifs/smb1ops.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1067,6 +1067,10 @@ struct smb_version_operations smb1_operations = {
		.query_mf_symlink = cifs_query_mf_symlink,
		.create_mf_symlink = cifs_create_mf_symlink,
		.is_read_op = cifs_is_read_op,
		#ifdef CONFIG_CIFS_XATTR
		.query_all_EAs = CIFSSMBQAllEAs,
		.set_EA = CIFSSMBSetEA,
		#endif /* CIFS_XATTR */
		};

		struct smb_version_values smb1_values = {

Admin message