11 files changed, 66 insertions, 49 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 12b1176b87b0..bcdf4d4420f1 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -258,6 +258,9 @@ struct smb_version_values {
         size_t          max_header_size;
         size_t          read_rsp_size;
         __le16          lock_cmd;
+        unsigned int    cap_unix;
+        unsigned int    cap_nt_find;
+        unsigned int    cap_large_files;
 };
 
 #define HEADER_SIZE(server) (server->vals->header_size)
@@ -408,7 +411,7 @@ struct TCP_Server_Info {
         unsigned int max_vcs;   /* maximum number of smb sessions, at least
                                    those that can be specified uniquely with
                                    vcnumbers */
-        int capabilities; /* allow selective disabling of caps by smb sess */
+        unsigned int capabilities; /* selective disabling of caps by smb sess */
         int timeAdj;  /* Adjust for difference in server time zone in sec */
         __u64 CurrentMid;         /* multiplex id - rotating counter */
         char cryptkey[CIFS_CRYPTO_KEY_SIZE]; /* used by ntlm, ntlmv2 etc */
@@ -532,7 +535,7 @@ struct cifs_ses {
         __u64 Suid;             /* remote smb uid  */
         uid_t linux_uid;        /* overriding owner of files on the mount */
         uid_t cred_uid;         /* owner of credentials */
-        int capabilities;
+        unsigned int capabilities;
         char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for
                                 TCP names - will ipv6 and sctp addresses fit? */
         char *user_name;        /* must not be null except during init of sess
@@ -554,6 +557,13 @@ struct cifs_ses {
    which do not negotiate NTLM or POSIX dialects, but instead
    negotiate one of the older LANMAN dialects */
 #define CIFS_SES_LANMAN 8
+
+static inline bool
+cap_unix(struct cifs_ses *ses)
+{
+        return ses->server->vals->cap_unix & ses->capabilities;
+}
+
 /*
  * there is one of these for each connection to a resource on a particular
  * session
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 5ab173fd6339..6df6fa14cba8 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3634,7 +3634,7 @@ try_mount_again:
         }
 
         /* tell server which Unix caps we support */
-        if (tcon->ses->capabilities & CAP_UNIX) {
+        if (cap_unix(tcon->ses)) {
                 /* reset of caps checks mount to see if unix extensions
                    disabled for just this mount */
                 reset_cifs_unix_caps(xid, tcon, cifs_sb, volume_info);
@@ -3993,7 +3993,7 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses,
         ses->flags = 0;
         ses->capabilities = server->capabilities;
         if (linuxExtEnabled == 0)
-                ses->capabilities &= (~CAP_UNIX);
+                ses->capabilities &= (~server->vals->cap_unix);
 
         cFYI(1, "Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d",
                  server->sec_mode, server->capabilities, server->timeAdj);
@@ -4100,7 +4100,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
                 goto out;
         }
 
-        if (ses->capabilities & CAP_UNIX)
+        if (cap_unix(ses))
                 reset_cifs_unix_caps(0, tcon, NULL, vol_info);
 out:
         kfree(vol_info->username);
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 2caba0b54acb..cbe709ad6663 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -182,8 +182,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
                 goto out;
         }
 
-        if (tcon->unix_ext && (tcon->ses->capabilities & CAP_UNIX) &&
-            !tcon->broken_posix_open &&
+        if (tcon->unix_ext && cap_unix(tcon->ses) && !tcon->broken_posix_open &&
             (CIFS_UNIX_POSIX_PATH_OPS_CAP &
                         le64_to_cpu(tcon->fsUnixInfo.Capability))) {
                 rc = cifs_posix_open(full_path, &newinode,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 93b3b1358409..07e9d41cade7 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -385,9 +385,8 @@ int cifs_open(struct inode *inode, struct file *file)
                 oplock = 0;
 
         if (!tcon->broken_posix_open && tcon->unix_ext &&
-            (tcon->ses->capabilities & CAP_UNIX) &&
-            (CIFS_UNIX_POSIX_PATH_OPS_CAP &
-                        le64_to_cpu(tcon->fsUnixInfo.Capability))) {
+            cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &
+                                le64_to_cpu(tcon->fsUnixInfo.Capability))) {
                 /* can not refresh inode info since size could be stale */
                 rc = cifs_posix_open(full_path, &inode, inode->i_sb,
                                 cifs_sb->mnt_file_mode /* ignored */,
@@ -509,10 +508,9 @@ static int cifs_reopen_file(struct cifsFileInfo *pCifsFile, bool can_flush)
         else
                 oplock = 0;
 
-        if (tcon->unix_ext && (tcon->ses->capabilities & CAP_UNIX) &&
+        if (tcon->unix_ext && cap_unix(tcon->ses) &&
             (CIFS_UNIX_POSIX_PATH_OPS_CAP &
-                        le64_to_cpu(tcon->fsUnixInfo.Capability))) {
-
+                                le64_to_cpu(tcon->fsUnixInfo.Capability))) {
                 /*
                  * O_CREAT, O_EXCL and O_TRUNC already had their effect on the
                  * original open. Must mask them off for a reopen.
@@ -1071,7 +1069,7 @@ cifs_push_locks(struct cifsFileInfo *cfile)
         struct cifs_sb_info *cifs_sb = CIFS_SB(cfile->dentry->d_sb);
         struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
 
-        if ((tcon->ses->capabilities & CAP_UNIX) &&
+        if (cap_unix(tcon->ses) &&
             (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
             ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
                 return cifs_push_posix_locks(cfile);
@@ -1419,7 +1417,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
         netfid = cfile->netfid;
         cinode = CIFS_I(file->f_path.dentry->d_inode);
 
-        if ((tcon->ses->capabilities & CAP_UNIX) &&
+        if (cap_unix(tcon->ses) &&
             (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
             ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
                 posix_lck = true;
@@ -2745,7 +2743,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
         unsigned int current_read_size;
         unsigned int rsize;
         struct cifs_sb_info *cifs_sb;
-        struct cifs_tcon *pTcon;
+        struct cifs_tcon *tcon;
         unsigned int xid;
         char *current_offset;
         struct cifsFileInfo *open_file;
@@ -2765,7 +2763,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
                 return rc;
         }
         open_file = file->private_data;
-        pTcon = tlink_tcon(open_file->tlink);
+        tcon = tlink_tcon(open_file->tlink);
 
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)