diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-11-26 11:09:55 -0500 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2012-12-05 13:27:30 -0600 |
| commit | b979aaa1777259330435c47f900833dabe9189e8 (patch) | |
| tree | 45db63a100144fd74e5997ab329f855bed520ed1 /fs/cifs/cifsglob.h | |
| parent | ccb5c001b3035ca470fe21424e439530ba838510 (diff) | |
| download | linux-3.10-b979aaa1777259330435c47f900833dabe9189e8.tar.gz linux-3.10-b979aaa1777259330435c47f900833dabe9189e8.tar.bz2 linux-3.10-b979aaa1777259330435c47f900833dabe9189e8.zip | |
cifs: get rid of smb_vol->UNCip and smb_vol->port
Passing this around as a string is contorted and painful. Instead, just
convert these to a sockaddr as soon as possible, since that's how we're
going to work with it later anyway.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index ac66409fb9d..052d85b333f 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -394,7 +394,6 @@ struct smb_vol { char *password; char *domainname; char *UNC; - char *UNCip; char *iocharset; /* local code page for mapping to and from Unicode */ char source_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* clnt nb name */ char target_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* srvr nb name */ @@ -442,11 +441,11 @@ struct smb_vol { unsigned int rsize; unsigned int wsize; bool sockopt_tcp_nodelay:1; - unsigned short int port; unsigned long actimeo; /* attribute cache timeout (jiffies) */ struct smb_version_operations *ops; struct smb_version_values *vals; char *prepath; + struct sockaddr_storage dstaddr; /* destination address */ struct sockaddr_storage srcaddr; /* allow binding to a local IP */ struct nls_table *local_nls; }; |