[CIFS] Fix SMB2 mounts so they don't try to set or get xattrs via cifs

When mounting with smb2 (or smb2.1 or smb3) we need to check to make
sure that attempts to query or set extended attributes do not
attempt to send the request with the older cifs protocol instead
(eventually we also need to add the support in SMB2
to query/set extended attributes but this patch prevents us from
using the wrong protocol for extended attribute operations).

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

1 files changed, 30 insertions, 19 deletions

diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index 09afda4cc58e..95c43bb20335 100644
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -82,9 +82,11 @@ int cifs_removexattr(struct dentry *direntry, const char *ea_name)
                         goto remove_ea_exit;
 
                 ea_name += XATTR_USER_PREFIX_LEN; /* skip past user. prefix */
-                rc = CIFSSMBSetEA(xid, pTcon, full_path, ea_name, NULL,
-                        (__u16)0, cifs_sb->local_nls,
-                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+                if (pTcon->ses->server->ops->set_EA)
+                        rc = pTcon->ses->server->ops->set_EA(xid, pTcon,
+                                full_path, ea_name, NULL, (__u16)0,
+                                cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
+                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
         }
 remove_ea_exit:
         kfree(full_path);
@@ -149,18 +151,22 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                         cifs_dbg(FYI, "attempt to set cifs inode metadata\n");
 
                 ea_name += XATTR_USER_PREFIX_LEN; /* skip past user. prefix */
-                rc = CIFSSMBSetEA(xid, pTcon, full_path, ea_name, ea_value,
-                        (__u16)value_size, cifs_sb->local_nls,
-                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+                if (pTcon->ses->server->ops->set_EA)
+                        rc = pTcon->ses->server->ops->set_EA(xid, pTcon,
+                                full_path, ea_name, ea_value, (__u16)value_size,
+                                cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
+                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
         } else if (strncmp(ea_name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN)
                    == 0) {
                 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
                         goto set_ea_exit;
 
                 ea_name += XATTR_OS2_PREFIX_LEN; /* skip past os2. prefix */
-                rc = CIFSSMBSetEA(xid, pTcon, full_path, ea_name, ea_value,
-                        (__u16)value_size, cifs_sb->local_nls,
-                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+                if (pTcon->ses->server->ops->set_EA)
+                        rc = pTcon->ses->server->ops->set_EA(xid, pTcon,
+                                full_path, ea_name, ea_value, (__u16)value_size,
+                                cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
+                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
         } else if (strncmp(ea_name, CIFS_XATTR_CIFS_ACL,
                         strlen(CIFS_XATTR_CIFS_ACL)) == 0) {
 #ifdef CONFIG_CIFS_ACL
@@ -272,17 +278,21 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
                         /* revalidate/getattr then populate from inode */
                 } /* BB add else when above is implemented */
                 ea_name += XATTR_USER_PREFIX_LEN; /* skip past user. prefix */
-                rc = CIFSSMBQAllEAs(xid, pTcon, full_path, ea_name, ea_value,
-                        buf_size, cifs_sb->local_nls,
-                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+                if (pTcon->ses->server->ops->query_all_EAs)
+                        rc = pTcon->ses->server->ops->query_all_EAs(xid, pTcon,
+                                full_path, ea_name, ea_value, buf_size,
+                                cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
+                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
         } else if (strncmp(ea_name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) == 0) {
                 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
                         goto get_ea_exit;
 
                 ea_name += XATTR_OS2_PREFIX_LEN; /* skip past os2. prefix */
-                rc = CIFSSMBQAllEAs(xid, pTcon, full_path, ea_name, ea_value,
-                        buf_size, cifs_sb->local_nls,
-                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+                if (pTcon->ses->server->ops->query_all_EAs)
+                        rc = pTcon->ses->server->ops->query_all_EAs(xid, pTcon,
+                                full_path, ea_name, ea_value, buf_size,
+                                cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
+                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
         } else if (strncmp(ea_name, POSIX_ACL_XATTR_ACCESS,
                           strlen(POSIX_ACL_XATTR_ACCESS)) == 0) {
 #ifdef CONFIG_CIFS_POSIX
@@ -400,11 +410,12 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size)
         /* if proc/fs/cifs/streamstoxattr is set then
                 search server for EAs or streams to
                 returns as xattrs */
-        rc = CIFSSMBQAllEAs(xid, pTcon, full_path, NULL, data,
-                                buf_size, cifs_sb->local_nls,
-                                cifs_sb->mnt_cifs_flags &
-                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
 
+        if (pTcon->ses->server->ops->query_all_EAs)
+                rc = pTcon->ses->server->ops->query_all_EAs(xid, pTcon,
+                                full_path, NULL, data, buf_size,
+                                cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
+                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
 list_ea_exit:
         kfree(full_path);
         free_xid(xid);