aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2010-04-21 00:12:10 -0400
committerSteve French <sfrench@us.ibm.com>2010-04-21 00:12:10 -0400
commitf19159dc5ab9ec28c3b8230689101335d98e2d68 (patch)
treedbfe881035d52e3fb578e253a9d27d56cbb09c2f /fs/cifs/cifssmb.c
parentb6b38f704a8193daba520493ebdaf7e819962fc8 (diff)
[CIFS] Cleanup various minor breakage in previous cFYI cleanup
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index be23e426ffb3..980c38c658b7 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * fs/cifs/cifssmb.c 2 * fs/cifs/cifssmb.c
3 * 3 *
4 * Copyright (C) International Business Machines Corp., 2002,2009 4 * Copyright (C) International Business Machines Corp., 2002,2010
5 * Author(s): Steve French (sfrench@us.ibm.com) 5 * Author(s): Steve French (sfrench@us.ibm.com)
6 * 6 *
7 * Contains the routines for constructing the SMB PDUs themselves 7 * Contains the routines for constructing the SMB PDUs themselves
@@ -493,14 +493,14 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
493 goto neg_err_exit; 493 goto neg_err_exit;
494 } 494 }
495 495
496 cFYI(1, ("LANMAN negotiated")); 496 cFYI(1, "LANMAN negotiated");
497 /* we will not end up setting signing flags - as no signing 497 /* we will not end up setting signing flags - as no signing
498 was in LANMAN and server did not return the flags on */ 498 was in LANMAN and server did not return the flags on */
499 goto signing_check; 499 goto signing_check;
500#else /* weak security disabled */ 500#else /* weak security disabled */
501 } else if (pSMBr->hdr.WordCount == 13) { 501 } else if (pSMBr->hdr.WordCount == 13) {
502 cERROR(1, ("mount failed, cifs module not built " 502 cERROR(1, "mount failed, cifs module not built "
503 "with CIFS_WEAK_PW_HASH support")); 503 "with CIFS_WEAK_PW_HASH support");
504 rc = -EOPNOTSUPP; 504 rc = -EOPNOTSUPP;
505#endif /* WEAK_PW_HASH */ 505#endif /* WEAK_PW_HASH */
506 goto neg_err_exit; 506 goto neg_err_exit;
@@ -1513,7 +1513,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
1513 (struct smb_hdr *) pSMBr, &bytes_returned, long_op); 1513 (struct smb_hdr *) pSMBr, &bytes_returned, long_op);
1514 cifs_stats_inc(&tcon->num_writes); 1514 cifs_stats_inc(&tcon->num_writes);
1515 if (rc) { 1515 if (rc) {
1516 cFYI(1, ("Send error in write = %d", rc)); 1516 cFYI(1, "Send error in write = %d", rc);
1517 } else { 1517 } else {
1518 *nbytes = le16_to_cpu(pSMBr->CountHigh); 1518 *nbytes = le16_to_cpu(pSMBr->CountHigh);
1519 *nbytes = (*nbytes) << 16; 1519 *nbytes = (*nbytes) << 16;
@@ -2529,7 +2529,7 @@ validate_ntransact(char *buf, char **ppparm, char **ppdata,
2529 cFYI(1, "data starts after end of smb"); 2529 cFYI(1, "data starts after end of smb");
2530 return -EINVAL; 2530 return -EINVAL;
2531 } else if (data_count + *ppdata > end_of_smb) { 2531 } else if (data_count + *ppdata > end_of_smb) {
2532 cFYI(1, "data %p + count %d (%p) ends after end of smb %p start %p", 2532 cFYI(1, "data %p + count %d (%p) past smb end %p start %p",
2533 *ppdata, data_count, (data_count + *ppdata), 2533 *ppdata, data_count, (data_count + *ppdata),
2534 end_of_smb, pSMBr); 2534 end_of_smb, pSMBr);
2535 return -EINVAL; 2535 return -EINVAL;
@@ -3304,7 +3304,7 @@ QFileInfoRetry:
3304 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, 3304 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
3305 (struct smb_hdr *) pSMBr, &bytes_returned, 0); 3305 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
3306 if (rc) { 3306 if (rc) {
3307 cFYI(1, ("Send error in QPathInfo = %d", rc)); 3307 cFYI(1, "Send error in QPathInfo = %d", rc);
3308 } else { /* decode response */ 3308 } else { /* decode response */
3309 rc = validate_t2((struct smb_t2_rsp *)pSMBr); 3309 rc = validate_t2((struct smb_t2_rsp *)pSMBr);
3310 3310
@@ -3472,14 +3472,14 @@ UnixQFileInfoRetry:
3472 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, 3472 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
3473 (struct smb_hdr *) pSMBr, &bytes_returned, 0); 3473 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
3474 if (rc) { 3474 if (rc) {
3475 cFYI(1, ("Send error in QPathInfo = %d", rc)); 3475 cFYI(1, "Send error in QPathInfo = %d", rc);
3476 } else { /* decode response */ 3476 } else { /* decode response */
3477 rc = validate_t2((struct smb_t2_rsp *)pSMBr); 3477 rc = validate_t2((struct smb_t2_rsp *)pSMBr);
3478 3478
3479 if (rc || (pSMBr->ByteCount < sizeof(FILE_UNIX_BASIC_INFO))) { 3479 if (rc || (pSMBr->ByteCount < sizeof(FILE_UNIX_BASIC_INFO))) {
3480 cERROR(1, ("Malformed FILE_UNIX_BASIC_INFO response.\n" 3480 cERROR(1, "Malformed FILE_UNIX_BASIC_INFO response.\n"
3481 "Unix Extensions can be disabled on mount " 3481 "Unix Extensions can be disabled on mount "
3482 "by specifying the nosfu mount option.")); 3482 "by specifying the nosfu mount option.");
3483 rc = -EIO; /* bad smb */ 3483 rc = -EIO; /* bad smb */
3484 } else { 3484 } else {
3485 __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset); 3485 __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
@@ -4037,7 +4037,7 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
4037 data_end = (char *)(&(pSMBr->PathConsumed)) + 4037 data_end = (char *)(&(pSMBr->PathConsumed)) +
4038 le16_to_cpu(pSMBr->t2.DataCount); 4038 le16_to_cpu(pSMBr->t2.DataCount);
4039 4039
4040 cFYI(1, "num_referrals: %d dfs flags: 0x%x ... \n", 4040 cFYI(1, "num_referrals: %d dfs flags: 0x%x ...\n",
4041 *num_of_nodes, 4041 *num_of_nodes,
4042 le32_to_cpu(pSMBr->DFSFlags)); 4042 le32_to_cpu(pSMBr->DFSFlags));
4043 4043