diff options
| author | Jeff Layton <jlayton@redhat.com> | 2009-06-10 10:04:58 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-10 14:34:35 -0400 |
| commit | 61b6bc525a34931bb73e4c95bfe009cd9572a288 (patch) | |
| tree | 4c60f5233b72c7ab1a4a4e6e123d49ba2de3c13c | |
| parent | 58f7f68f228c3aba2ba4468d92e2cec35724ba2e (diff) | |
cifs: remove never-used in6_addr option
This option was never used to my knowledge. Remove it before someone
does...
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/connect.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 6298dc32adeb..97f4311b9a8e 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -62,7 +62,6 @@ struct smb_vol { | |||
| 62 | char *domainname; | 62 | char *domainname; |
| 63 | char *UNC; | 63 | char *UNC; |
| 64 | char *UNCip; | 64 | char *UNCip; |
| 65 | char *in6_addr; /* ipv6 address as human readable form of in6_addr */ | ||
| 66 | char *iocharset; /* local code page for mapping to and from Unicode */ | 65 | char *iocharset; /* local code page for mapping to and from Unicode */ |
| 67 | char source_rfc1001_name[16]; /* netbios name of client */ | 66 | char source_rfc1001_name[16]; /* netbios name of client */ |
| 68 | char target_rfc1001_name[16]; /* netbios name of server for Win9x/ME */ | 67 | char target_rfc1001_name[16]; /* netbios name of server for Win9x/ME */ |
| @@ -1320,16 +1319,6 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
| 1320 | vol->direct_io = 1; | 1319 | vol->direct_io = 1; |
| 1321 | } else if (strnicmp(data, "forcedirectio", 13) == 0) { | 1320 | } else if (strnicmp(data, "forcedirectio", 13) == 0) { |
| 1322 | vol->direct_io = 1; | 1321 | vol->direct_io = 1; |
| 1323 | } else if (strnicmp(data, "in6_addr", 8) == 0) { | ||
| 1324 | if (!value || !*value) { | ||
| 1325 | vol->in6_addr = NULL; | ||
| 1326 | } else if (strnlen(value, 49) == 48) { | ||
| 1327 | vol->in6_addr = value; | ||
| 1328 | } else { | ||
| 1329 | printk(KERN_WARNING "CIFS: ip v6 address not " | ||
| 1330 | "48 characters long\n"); | ||
| 1331 | return 1; | ||
| 1332 | } | ||
| 1333 | } else if (strnicmp(data, "noac", 4) == 0) { | 1322 | } else if (strnicmp(data, "noac", 4) == 0) { |
| 1334 | printk(KERN_WARNING "CIFS: Mount option noac not " | 1323 | printk(KERN_WARNING "CIFS: Mount option noac not " |
| 1335 | "supported. Instead set " | 1324 | "supported. Instead set " |
