summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-05-16 18:48:38 +0000
committerSteve French <sfrench@us.ibm.com>2008-05-16 18:48:38 +0000
commita1fe78f16eac7d03d3c391dd5d54559826574982 (patch)
tree636561017d12be1a5d6e88541fa6ae206c74c8d6 /fs/cifs/cifssmb.c
parentfec4585fd71cc5ec35d134e8c3854f6e8c4503f0 (diff)
downloadblackbird-op-linux-a1fe78f16eac7d03d3c391dd5d54559826574982.tar.gz
blackbird-op-linux-a1fe78f16eac7d03d3c391dd5d54559826574982.zip
[CIFS] Add missing defines for DFS
Also has minor cleanup of previous patch CC: Igor Mammedov <niallain@gmail.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 6f8ed93a4ae8..7b9938445b07 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -107,6 +107,7 @@ cifs_strncpy_to_host(char **dst, const char *src, const int maxlen,
strncpy(*dst, src, plen);
}
(*dst)[plen] = 0;
+ (*dst)[plen+1] = 0; /* harmless for ASCII case, needed for Unicode */
return 0;
cifs_strncpy_to_host_ErrExit:
@@ -3907,7 +3908,7 @@ GetInodeNumOut:
* on failure - errno
*/
static int
-parse_DFS_REFERRALS(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
+parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
unsigned int *num_of_nodes,
struct dfs_info3_param **target_nodes,
const struct nls_table *nls_codepage)
@@ -3924,7 +3925,7 @@ parse_DFS_REFERRALS(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
cERROR(1, ("num_referrals: must be at least > 0,"
"but we get num_referrals = %d\n", *num_of_nodes));
rc = -EINVAL;
- goto parse_DFS_REFERRALS_exit;
+ goto parse_DFS_referrals_exit;
}
ref = (struct dfs_referral_level_3 *) &(pSMBr->referrals);
@@ -3932,7 +3933,7 @@ parse_DFS_REFERRALS(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
cERROR(1, ("Referrals of V%d version are not supported,"
"should be V3", ref->VersionNumber));
rc = -EINVAL;
- goto parse_DFS_REFERRALS_exit;
+ goto parse_DFS_referrals_exit;
}
/* get the upper boundary of the resp buffer */
@@ -3948,7 +3949,7 @@ parse_DFS_REFERRALS(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
if (*target_nodes == NULL) {
cERROR(1, ("Failed to allocate buffer for target_nodes\n"));
rc = -ENOMEM;
- goto parse_DFS_REFERRALS_exit;
+ goto parse_DFS_referrals_exit;
}
/* collect neccessary data from referrals */
@@ -3968,7 +3969,7 @@ parse_DFS_REFERRALS(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
rc = cifs_strncpy_to_host(&(node->path_name), temp,
max_len, is_unicode, nls_codepage);
if (rc)
- goto parse_DFS_REFERRALS_exit;
+ goto parse_DFS_referrals_exit;
/* copy link target UNC */
temp = (char *)ref + le16_to_cpu(ref->NetworkAddressOffset);
@@ -3976,12 +3977,12 @@ parse_DFS_REFERRALS(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
rc = cifs_strncpy_to_host(&(node->node_name), temp,
max_len, is_unicode, nls_codepage);
if (rc)
- goto parse_DFS_REFERRALS_exit;
+ goto parse_DFS_referrals_exit;
ref += ref->Size;
}
-parse_DFS_REFERRALS_exit:
+parse_DFS_referrals_exit:
if (rc) {
free_dfs_info_array(*target_nodes, *num_of_nodes);
*target_nodes = NULL;
@@ -4090,7 +4091,7 @@ getDFSRetry:
le16_to_cpu(pSMBr->t2.DataOffset)));
/* parse returned result into more usable form */
- rc = parse_DFS_REFERRALS(pSMBr, num_of_nodes,
+ rc = parse_DFS_referrals(pSMBr, num_of_nodes,
target_nodes, nls_codepage);
GetDFSRefExit:
OpenPOWER on IntegriCloud