diff options
author | Steve French <sfrench@us.ibm.com> | 2011-05-27 00:34:02 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-05-27 00:34:02 -0400 |
commit | 96daf2b09178d8ebde2b0d56b027de917c17dfdf (patch) | |
tree | 74802fa44e87925e49067d5106eb762cc27b9b97 /fs/cifs/cifsencrypt.c | |
parent | 07cc6cf9ef84bcf6a60ee513332bcb0ad5d628d8 (diff) |
[CIFS] Rename three structures to avoid camel case
secMode to sec_mode
and
cifsTconInfo to cifs_tcon
and
cifsSesInfo to cifs_ses
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsencrypt.c')
-rw-r--r-- | fs/cifs/cifsencrypt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index 45c3f78c8f81..dfbd9f1f373d 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c | |||
@@ -229,7 +229,7 @@ int cifs_verify_signature(struct smb_hdr *cifs_pdu, | |||
229 | } | 229 | } |
230 | 230 | ||
231 | /* first calculate 24 bytes ntlm response and then 16 byte session key */ | 231 | /* first calculate 24 bytes ntlm response and then 16 byte session key */ |
232 | int setup_ntlm_response(struct cifsSesInfo *ses) | 232 | int setup_ntlm_response(struct cifs_ses *ses) |
233 | { | 233 | { |
234 | int rc = 0; | 234 | int rc = 0; |
235 | unsigned int temp_len = CIFS_SESS_KEY_SIZE + CIFS_AUTH_RESP_SIZE; | 235 | unsigned int temp_len = CIFS_SESS_KEY_SIZE + CIFS_AUTH_RESP_SIZE; |
@@ -312,7 +312,7 @@ int calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt, | |||
312 | * Allocate domain name which gets freed when session struct is deallocated. | 312 | * Allocate domain name which gets freed when session struct is deallocated. |
313 | */ | 313 | */ |
314 | static int | 314 | static int |
315 | build_avpair_blob(struct cifsSesInfo *ses, const struct nls_table *nls_cp) | 315 | build_avpair_blob(struct cifs_ses *ses, const struct nls_table *nls_cp) |
316 | { | 316 | { |
317 | unsigned int dlen; | 317 | unsigned int dlen; |
318 | unsigned int wlen; | 318 | unsigned int wlen; |
@@ -400,7 +400,7 @@ build_avpair_blob(struct cifsSesInfo *ses, const struct nls_table *nls_cp) | |||
400 | * about target string i.e. for some, just user name might suffice. | 400 | * about target string i.e. for some, just user name might suffice. |
401 | */ | 401 | */ |
402 | static int | 402 | static int |
403 | find_domain_name(struct cifsSesInfo *ses, const struct nls_table *nls_cp) | 403 | find_domain_name(struct cifs_ses *ses, const struct nls_table *nls_cp) |
404 | { | 404 | { |
405 | unsigned int attrsize; | 405 | unsigned int attrsize; |
406 | unsigned int type; | 406 | unsigned int type; |
@@ -445,7 +445,7 @@ find_domain_name(struct cifsSesInfo *ses, const struct nls_table *nls_cp) | |||
445 | return 0; | 445 | return 0; |
446 | } | 446 | } |
447 | 447 | ||
448 | static int calc_ntlmv2_hash(struct cifsSesInfo *ses, char *ntlmv2_hash, | 448 | static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, |
449 | const struct nls_table *nls_cp) | 449 | const struct nls_table *nls_cp) |
450 | { | 450 | { |
451 | int rc = 0; | 451 | int rc = 0; |
@@ -527,7 +527,7 @@ calc_exit_2: | |||
527 | } | 527 | } |
528 | 528 | ||
529 | static int | 529 | static int |
530 | CalcNTLMv2_response(const struct cifsSesInfo *ses, char *ntlmv2_hash) | 530 | CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash) |
531 | { | 531 | { |
532 | int rc; | 532 | int rc; |
533 | unsigned int offset = CIFS_SESS_KEY_SIZE + 8; | 533 | unsigned int offset = CIFS_SESS_KEY_SIZE + 8; |
@@ -563,7 +563,7 @@ CalcNTLMv2_response(const struct cifsSesInfo *ses, char *ntlmv2_hash) | |||
563 | 563 | ||
564 | 564 | ||
565 | int | 565 | int |
566 | setup_ntlmv2_rsp(struct cifsSesInfo *ses, const struct nls_table *nls_cp) | 566 | setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) |
567 | { | 567 | { |
568 | int rc; | 568 | int rc; |
569 | int baselen; | 569 | int baselen; |
@@ -649,7 +649,7 @@ setup_ntlmv2_rsp_ret: | |||
649 | } | 649 | } |
650 | 650 | ||
651 | int | 651 | int |
652 | calc_seckey(struct cifsSesInfo *ses) | 652 | calc_seckey(struct cifs_ses *ses) |
653 | { | 653 | { |
654 | int rc; | 654 | int rc; |
655 | struct crypto_blkcipher *tfm_arc4; | 655 | struct crypto_blkcipher *tfm_arc4; |