Merge branch 'linus' into x86/urgent

[sfrench/cifs-2.6.git] / fs / cifs / connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index e5a2fe7f0dd45c80f3ac278d8d0fe3b4a3339dc6..a57da1b88bdf5b5342b326ea06eb8686b2882cbe 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -57,9 +57,6 @@
 #include "smb2proto.h"
 #include "smbdirect.h"
 
-#define CIFS_PORT 445
-#define RFC1001_PORT 139
-
 extern mempool_t *cifs_req_poolp;
 extern bool disable_legacy_dialects;
 
@@ -320,7 +317,7 @@ static int generic_ip_connect(struct TCP_Server_Info *server);
 static void tlink_rb_insert(struct rb_root *root, struct tcon_link *new_tlink);
 static void cifs_prune_tlinks(struct work_struct *work);
 static int cifs_setup_volume_info(struct smb_vol *volume_info, char *mount_data,
-                                       const char *devname);
+                                       const char *devname, bool is_smb3);
 
 /*
  * cifs tcp session reconnection
@@ -1166,7 +1163,7 @@ cifs_parse_cache_flavor(char *value, struct smb_vol *vol)
 }
 
 static int
-cifs_parse_smb_version(char *value, struct smb_vol *vol)
+cifs_parse_smb_version(char *value, struct smb_vol *vol, bool is_smb3)
 {
        substring_t args[MAX_OPT_ARGS];
 
@@ -1176,6 +1173,10 @@ cifs_parse_smb_version(char *value, struct smb_vol *vol)
                        cifs_dbg(VFS, "mount with legacy dialect disabled\n");
                        return 1;
                }
+               if (is_smb3) {
+                       cifs_dbg(VFS, "vers=1.0 (cifs) not permitted when mounting with smb3\n");
+                       return 1;
+               }
                vol->ops = &smb1_operations;
                vol->vals = &smb1_values;
                break;
@@ -1184,6 +1185,10 @@ cifs_parse_smb_version(char *value, struct smb_vol *vol)
                        cifs_dbg(VFS, "mount with legacy dialect disabled\n");
                        return 1;
                }
+               if (is_smb3) {
+                       cifs_dbg(VFS, "vers=2.0 not permitted when mounting with smb3\n");
+                       return 1;
+               }
                vol->ops = &smb20_operations;
                vol->vals = &smb20_values;
                break;
@@ -1272,7 +1277,7 @@ cifs_parse_devname(const char *devname, struct smb_vol *vol)
 
 static int
 cifs_parse_mount_options(const char *mountdata, const char *devname,
-                        struct smb_vol *vol)
+                        struct smb_vol *vol, bool is_smb3)
 {
        char *data, *end;
        char *mountdata_copy = NULL, *options;
@@ -1985,7 +1990,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                        if (string == NULL)
                                goto out_nomem;
 
-                       if (cifs_parse_smb_version(string, vol) != 0)
+                       if (cifs_parse_smb_version(string, vol, is_smb3) != 0)
                                goto cifs_parse_mount_err;
                        got_version = true;
                        break;
@@ -3021,8 +3026,11 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info)
 
 #ifdef CONFIG_CIFS_SMB311
        if ((volume_info->linux_ext) && (ses->server->posix_ext_supported)) {
-               if (ses->server->vals->protocol_id == SMB311_PROT_ID)
+               if (ses->server->vals->protocol_id == SMB311_PROT_ID) {
                        tcon->posix_extensions = true;
+                       printk_once(KERN_WARNING
+                               "SMB3.11 POSIX Extensions are experimental\n");
+               }
        }
 #endif /* 311 */
 
@@ -3116,12 +3124,6 @@ cifs_put_tlink(struct tcon_link *tlink)
        return;
 }
 
-static inline struct tcon_link *
-cifs_sb_master_tlink(struct cifs_sb_info *cifs_sb)
-{
-       return cifs_sb->master_tlink;
-}
-
 static int
 compare_mount_options(struct super_block *sb, struct cifs_mnt_data *mnt_data)
 {
@@ -3803,7 +3805,7 @@ expand_dfs_referral(const unsigned int xid, struct cifs_ses *ses,
                } else {
                        cleanup_volume_info_contents(volume_info);
                        rc = cifs_setup_volume_info(volume_info, mdata,
-                                                       fake_devname);
+                                                       fake_devname, false);
                }
                kfree(fake_devname);
                kfree(cifs_sb->mountdata);
@@ -3816,11 +3818,11 @@ expand_dfs_referral(const unsigned int xid, struct cifs_ses *ses,
 
 static int
 cifs_setup_volume_info(struct smb_vol *volume_info, char *mount_data,
-                       const char *devname)
+                       const char *devname, bool is_smb3)
 {
        int rc = 0;
 
-       if (cifs_parse_mount_options(mount_data, devname, volume_info))
+       if (cifs_parse_mount_options(mount_data, devname, volume_info, is_smb3))
                return -EINVAL;
 
        if (volume_info->nullauth) {
@@ -3854,7 +3856,7 @@ cifs_setup_volume_info(struct smb_vol *volume_info, char *mount_data,
 }
 
 struct smb_vol *
-cifs_get_volume_info(char *mount_data, const char *devname)
+cifs_get_volume_info(char *mount_data, const char *devname, bool is_smb3)
 {
        int rc;
        struct smb_vol *volume_info;
@@ -3863,7 +3865,7 @@ cifs_get_volume_info(char *mount_data, const char *devname)
        if (!volume_info)
                return ERR_PTR(-ENOMEM);
 
-       rc = cifs_setup_volume_info(volume_info, mount_data, devname);
+       rc = cifs_setup_volume_info(volume_info, mount_data, devname, is_smb3);
        if (rc) {
                cifs_cleanup_volume_info(volume_info);
                volume_info = ERR_PTR(rc);