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>
This commit is contained in:
parent
d971e0656b
commit
762a4206a3
|
@ -99,7 +99,7 @@ static int cifs_calc_signature(const struct kvec *iov, int n_vec,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* must be called with server->srv_mutex held */
|
/* must be called with server->srv_mutex held */
|
||||||
int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *server,
|
int cifs_sign_smbv(struct kvec *iov, int n_vec, struct TCP_Server_Info *server,
|
||||||
__u32 *pexpected_response_sequence_number)
|
__u32 *pexpected_response_sequence_number)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
@ -143,7 +143,7 @@ int cifs_sign_smb(struct smb_hdr *cifs_pdu, struct TCP_Server_Info *server,
|
||||||
iov.iov_base = cifs_pdu;
|
iov.iov_base = cifs_pdu;
|
||||||
iov.iov_len = be32_to_cpu(cifs_pdu->smb_buf_length) + 4;
|
iov.iov_len = be32_to_cpu(cifs_pdu->smb_buf_length) + 4;
|
||||||
|
|
||||||
return cifs_sign_smb2(&iov, 1, server,
|
return cifs_sign_smbv(&iov, 1, server,
|
||||||
pexpected_response_sequence_number);
|
pexpected_response_sequence_number);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -399,7 +399,7 @@ extern struct cifs_tcon *tconInfoAlloc(void);
|
||||||
extern void tconInfoFree(struct cifs_tcon *);
|
extern void tconInfoFree(struct cifs_tcon *);
|
||||||
|
|
||||||
extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *, __u32 *);
|
extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info *, __u32 *);
|
||||||
extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *,
|
extern int cifs_sign_smbv(struct kvec *iov, int n_vec, struct TCP_Server_Info *,
|
||||||
__u32 *);
|
__u32 *);
|
||||||
extern int cifs_verify_signature(struct kvec *iov, unsigned int nr_iov,
|
extern int cifs_verify_signature(struct kvec *iov, unsigned int nr_iov,
|
||||||
struct TCP_Server_Info *server,
|
struct TCP_Server_Info *server,
|
||||||
|
|
|
@ -361,7 +361,7 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov,
|
||||||
if (mid == NULL)
|
if (mid == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
rc = cifs_sign_smb2(iov, nvec, server, &mid->sequence_number);
|
rc = cifs_sign_smbv(iov, nvec, server, &mid->sequence_number);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
DeleteMidQEntry(mid);
|
DeleteMidQEntry(mid);
|
||||||
return rc;
|
return rc;
|
||||||
|
@ -524,7 +524,7 @@ cifs_setup_request(struct cifs_ses *ses, struct kvec *iov,
|
||||||
rc = allocate_mid(ses, hdr, &mid);
|
rc = allocate_mid(ses, hdr, &mid);
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
rc = cifs_sign_smb2(iov, nvec, ses->server, &mid->sequence_number);
|
rc = cifs_sign_smbv(iov, nvec, ses->server, &mid->sequence_number);
|
||||||
if (rc)
|
if (rc)
|
||||||
delete_mid(mid);
|
delete_mid(mid);
|
||||||
*ret_mid = mid;
|
*ret_mid = mid;
|
||||||
|
|
Loading…
Reference in New Issue