aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-07-23 13:28:38 -0400
committerSteve French <smfrench@gmail.com>2012-07-23 17:36:34 -0400
commit762a4206a3f415db0fcf2c7aed9a5e91deff221d (patch)
treea7c35666ca2072830c4668a04f5727b085e950d3
parentd971e0656bf6e57925292dae755d36fb3c5b093d (diff)
cifs: rename cifs_sign_smb2 to cifs_sign_smbv
"smb2" makes me think of the SMB2.x protocol, which isn't at all what this function is for... Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
-rw-r--r--fs/cifs/cifsencrypt.c4
-rw-r--r--fs/cifs/cifsproto.h2
-rw-r--r--fs/cifs/transport.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index db768cb67e3..6a0d741159f 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -99,7 +99,7 @@ static int cifs_calc_signature(const struct kvec *iov, int n_vec,
99} 99}
100 100
101/* must be called with server->srv_mutex held */ 101/* must be called with server->srv_mutex held */
102int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *server, 102int cifs_sign_smbv(struct kvec *iov, int n_vec, struct TCP_Server_Info *server,
103 __u32 *pexpected_response_sequence_number) 103 __u32 *pexpected_response_sequence_number)
104{ 104{
105 int rc = 0; 105 int rc = 0;
@@ -143,7 +143,7 @@ int cifs_sign_smb(struct smb_hdr *cifs_pdu, struct TCP_Server_Info *server,
143 iov.iov_base = cifs_pdu; 143 iov.iov_base = cifs_pdu;
144 iov.iov_len = be32_to_cpu(cifs_pdu->smb_buf_length) + 4; 144 iov.iov_len = be32_to_cpu(cifs_pdu->smb_buf_length) + 4;
145 145
146 return cifs_sign_smb2(&iov, 1, server, 146 return cifs_sign_smbv(&iov, 1, server,
147 pexpected_response_sequence_number); 147 pexpected_response_sequence_number);
148} 148}
149 149
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index baa1b6dc838..613320c9a78 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -399,7 +399,7 @@ extern struct cifs_tcon *tconInfoAlloc(void);
399extern void tconInfoFree(struct cifs_tcon *); 399extern void tconInfoFree(struct cifs_tcon *);
400 400
401extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *, __u32 *); 401extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *, __u32 *);
402extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *, 402extern int cifs_sign_smbv(struct kvec *iov, int n_vec, struct TCP_Server_Info *,
403 __u32 *); 403 __u32 *);
404extern int cifs_verify_signature(struct kvec *iov, unsigned int nr_iov, 404extern int cifs_verify_signature(struct kvec *iov, unsigned int nr_iov,
405 struct TCP_Server_Info *server, 405 struct TCP_Server_Info *server,
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index fdda15a6a80..3e6ffe35538 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -361,7 +361,7 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov,
361 if (mid == NULL) 361 if (mid == NULL)
362 return -ENOMEM; 362 return -ENOMEM;
363 363
364 rc = cifs_sign_smb2(iov, nvec, server, &mid->sequence_number); 364 rc = cifs_sign_smbv(iov, nvec, server, &mid->sequence_number);
365 if (rc) { 365 if (rc) {
366 DeleteMidQEntry(mid); 366 DeleteMidQEntry(mid);
367 return rc; 367 return rc;
@@ -524,7 +524,7 @@ cifs_setup_request(struct cifs_ses *ses, struct kvec *iov,
524 rc = allocate_mid(ses, hdr, &mid); 524 rc = allocate_mid(ses, hdr, &mid);
525 if (rc) 525 if (rc)
526 return rc; 526 return rc;
527 rc = cifs_sign_smb2(iov, nvec, ses->server, &mid->sequence_number); 527 rc = cifs_sign_smbv(iov, nvec, ses->server, &mid->sequence_number);
528 if (rc) 528 if (rc)
529 delete_mid(mid); 529 delete_mid(mid);
530 *ret_mid = mid; 530 *ret_mid = mid;