diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-05-22 07:04:51 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-05-23 14:08:05 -0400 |
commit | c02324a6ae6bd3e83533c59525111ffe03b7e791 (patch) | |
tree | 0c5c204b4c9a6167fdca73ad19eae27ccb41608b /fs/cifs/connect.c | |
parent | 59ffd84141472c45a1729a739e4730f974d26e63 (diff) |
cifs: remove unused SMB2 config and mount options
There's no SMB2 support in the CIFS filesystem driver, so there's no need to
have a config and mount option for it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index da284e3cb653..1067473b5ed1 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -102,7 +102,6 @@ struct smb_vol { | |||
102 | bool fsc:1; /* enable fscache */ | 102 | bool fsc:1; /* enable fscache */ |
103 | bool mfsymlinks:1; /* use Minshall+French Symlinks */ | 103 | bool mfsymlinks:1; /* use Minshall+French Symlinks */ |
104 | bool multiuser:1; | 104 | bool multiuser:1; |
105 | bool use_smb2:1; /* force smb2 use on mount instead of cifs */ | ||
106 | unsigned int rsize; | 105 | unsigned int rsize; |
107 | unsigned int wsize; | 106 | unsigned int wsize; |
108 | bool sockopt_tcp_nodelay:1; | 107 | bool sockopt_tcp_nodelay:1; |
@@ -1062,13 +1061,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, | |||
1062 | (strnicmp(value, "1", 1) == 0)) { | 1061 | (strnicmp(value, "1", 1) == 0)) { |
1063 | /* this is the default */ | 1062 | /* this is the default */ |
1064 | continue; | 1063 | continue; |
1065 | } else if ((strnicmp(value, "smb2", 4) == 0) || | ||
1066 | (strnicmp(value, "2", 1) == 0)) { | ||
1067 | #ifdef CONFIG_CIFS_SMB2 | ||
1068 | vol->use_smb2 = true; | ||
1069 | #else | ||
1070 | cERROR(1, "smb2 support not enabled"); | ||
1071 | #endif /* CONFIG_CIFS_SMB2 */ | ||
1072 | } | 1064 | } |
1073 | } else if ((strnicmp(data, "unc", 3) == 0) | 1065 | } else if ((strnicmp(data, "unc", 3) == 0) |
1074 | || (strnicmp(data, "target", 6) == 0) | 1066 | || (strnicmp(data, "target", 6) == 0) |