2 files changed, 36 insertions, 19 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 61228b7f6b67..a245d1809ed8 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -389,6 +389,12 @@ struct smb_version_operations {
                         struct cifsFileInfo *target_file, u64 src_off, u64 len,
                         u64 dest_off);
         int (*validate_negotiate)(const unsigned int, struct cifs_tcon *);
+        ssize_t (*query_all_EAs)(const unsigned int, struct cifs_tcon *,
+                        const unsigned char *, const unsigned char *, char *,
+                        size_t, const struct nls_table *, int);
+        int (*set_EA)(const unsigned int, struct cifs_tcon *, const char *,
+                        const char *, const void *, const __u16,
+                        const struct nls_table *, int);
 };
 
 struct smb_version_values {
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);