diff options
author | Steve French <sfrench@us.ibm.com> | 2008-12-02 19:57:54 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-12-25 21:29:10 -0500 |
commit | 61e748015866e48aff91284e3d300c6e3035a87a (patch) | |
tree | f31c94e76a900b9bd7d6f0abf6e1f4c74ac2e51f /fs/cifs/connect.c | |
parent | 3de2091ac722e7dbc37d87d9112ab19ec6a871de (diff) |
[CIFS] various minor cleanups pointed out by checkpatch script
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 351942042833..6107ee42b093 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -2582,7 +2582,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, | |||
2582 | __u16 action = le16_to_cpu(pSMBr->resp.Action); | 2582 | __u16 action = le16_to_cpu(pSMBr->resp.Action); |
2583 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); | 2583 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); |
2584 | if (action & GUEST_LOGIN) | 2584 | if (action & GUEST_LOGIN) |
2585 | cFYI(1, (" Guest login")); /* BB mark SesInfo struct? */ | 2585 | cFYI(1, ("Guest login")); /* BB mark SesInfo struct? */ |
2586 | ses->Suid = smb_buffer_response->Uid; /* UID left in wire format | 2586 | ses->Suid = smb_buffer_response->Uid; /* UID left in wire format |
2587 | (little endian) */ | 2587 | (little endian) */ |
2588 | cFYI(1, ("UID = %d ", ses->Suid)); | 2588 | cFYI(1, ("UID = %d ", ses->Suid)); |
@@ -2728,13 +2728,11 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, | |||
2728 | len)); | 2728 | len)); |
2729 | } | 2729 | } |
2730 | } else { | 2730 | } else { |
2731 | cERROR(1, | 2731 | cERROR(1, ("Security Blob Length extends beyond " |
2732 | (" Security Blob Length extends beyond " | ||
2733 | "end of SMB")); | 2732 | "end of SMB")); |
2734 | } | 2733 | } |
2735 | } else { | 2734 | } else { |
2736 | cERROR(1, | 2735 | cERROR(1, ("Invalid Word count %d: ", |
2737 | (" Invalid Word count %d: ", | ||
2738 | smb_buffer_response->WordCount)); | 2736 | smb_buffer_response->WordCount)); |
2739 | rc = -EIO; | 2737 | rc = -EIO; |
2740 | } | 2738 | } |
@@ -2892,7 +2890,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, | |||
2892 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); | 2890 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); |
2893 | 2891 | ||
2894 | if (action & GUEST_LOGIN) | 2892 | if (action & GUEST_LOGIN) |
2895 | cFYI(1, (" Guest login")); | 2893 | cFYI(1, ("Guest login")); |
2896 | /* Do we want to set anything in SesInfo struct when guest login? */ | 2894 | /* Do we want to set anything in SesInfo struct when guest login? */ |
2897 | 2895 | ||
2898 | bcc_ptr = pByteArea(smb_buffer_response); | 2896 | bcc_ptr = pByteArea(smb_buffer_response); |
@@ -2900,8 +2898,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, | |||
2900 | 2898 | ||
2901 | SecurityBlob2 = (PCHALLENGE_MESSAGE) bcc_ptr; | 2899 | SecurityBlob2 = (PCHALLENGE_MESSAGE) bcc_ptr; |
2902 | if (SecurityBlob2->MessageType != NtLmChallenge) { | 2900 | if (SecurityBlob2->MessageType != NtLmChallenge) { |
2903 | cFYI(1, | 2901 | cFYI(1, ("Unexpected NTLMSSP message type received %d", |
2904 | ("Unexpected NTLMSSP message type received %d", | ||
2905 | SecurityBlob2->MessageType)); | 2902 | SecurityBlob2->MessageType)); |
2906 | } else if (ses) { | 2903 | } else if (ses) { |
2907 | ses->Suid = smb_buffer_response->Uid; /* UID left in le format */ | 2904 | ses->Suid = smb_buffer_response->Uid; /* UID left in le format */ |
@@ -3073,8 +3070,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, | |||
3073 | cERROR(1, ("No session structure passed in.")); | 3070 | cERROR(1, ("No session structure passed in.")); |
3074 | } | 3071 | } |
3075 | } else { | 3072 | } else { |
3076 | cERROR(1, | 3073 | cERROR(1, ("Invalid Word count %d:", |
3077 | (" Invalid Word count %d:", | ||
3078 | smb_buffer_response->WordCount)); | 3074 | smb_buffer_response->WordCount)); |
3079 | rc = -EIO; | 3075 | rc = -EIO; |
3080 | } | 3076 | } |
@@ -3313,7 +3309,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, | |||
3313 | __u16 action = le16_to_cpu(pSMBr->resp.Action); | 3309 | __u16 action = le16_to_cpu(pSMBr->resp.Action); |
3314 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); | 3310 | __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength); |
3315 | if (action & GUEST_LOGIN) | 3311 | if (action & GUEST_LOGIN) |
3316 | cFYI(1, (" Guest login")); /* BB Should we set anything | 3312 | cFYI(1, ("Guest login")); /* BB Should we set anything |
3317 | in SesInfo struct ? */ | 3313 | in SesInfo struct ? */ |
3318 | /* if (SecurityBlob2->MessageType != NtLm??) { | 3314 | /* if (SecurityBlob2->MessageType != NtLm??) { |
3319 | cFYI("Unexpected message type on auth response is %d")); | 3315 | cFYI("Unexpected message type on auth response is %d")); |