diff options
| author | David Howells <dhowells@redhat.com> | 2010-07-22 18:33:01 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-08-05 17:17:50 +0000 |
| commit | 67b7626a0512d12e34b38ff45e32c693cf9c79a1 (patch) | |
| tree | b62f4274a09d0e7ceee6325c077f487c2bceca3b /fs/cifs/cifs_dfs_ref.c | |
| parent | f579903ef3e392251dc7e93cb521ddb622fbf8e0 (diff) | |
| download | linux-67b7626a0512d12e34b38ff45e32c693cf9c79a1.tar.gz linux-67b7626a0512d12e34b38ff45e32c693cf9c79a1.tar.bz2 linux-67b7626a0512d12e34b38ff45e32c693cf9c79a1.zip | |
CIFS: Make cifs_convert_address() take a const src pointer and a length
Make cifs_convert_address() take a const src pointer and a length so that all
the strlen() calls in their can be cut out and to make it unnecessary to modify
the src string.
Also return the data length from dns_resolve_server_name_to_ip() so that a
strlen() can be cut out of cifs_compose_mount_options() too.
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifs_dfs_ref.c')
| -rw-r--r-- | fs/cifs/cifs_dfs_ref.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index dc1ed50ea06e..d6ced7aa23cf 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c @@ -141,7 +141,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, } rc = dns_resolve_server_name_to_ip(*devname, &srvIP); - if (rc != 0) { + if (rc < 0) { cERROR(1, "%s: Failed to resolve server part of %s to IP: %d", __func__, *devname, rc); goto compose_mount_options_err; @@ -150,8 +150,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, * assuming that we have 'unc=' and 'ip=' in * the original sb_mountdata */ - md_len = strlen(sb_mountdata) + strlen(srvIP) + - strlen(ref->node_name) + 12; + md_len = strlen(sb_mountdata) + rc + strlen(ref->node_name) + 12; mountdata = kzalloc(md_len+1, GFP_KERNEL); if (mountdata == NULL) { rc = -ENOMEM; |