Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 762a4206 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

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: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent d971e065

fs/cifs/cifsencrypt.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int cifs_calc_signature(const struct kvec *iov, int n_vec, 
}



/* 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)

{

	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_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);

}

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ extern struct cifs_tcon *tconInfoAlloc(void); 
extern void tconInfoFree(struct cifs_tcon *);



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 *);

extern int cifs_verify_signature(struct kvec *iov, unsigned int nr_iov,

				 struct TCP_Server_Info *server,

fs/cifs/transport.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov, 
	if (mid == NULL)

		return -ENOMEM;



	rc = cifs_sign_smb2(iov, nvec, server, &mid->sequence_number);

	rc = cifs_sign_smbv(iov, nvec, server, &mid->sequence_number);

	if (rc) {

		DeleteMidQEntry(mid);

		return rc;
@@ -524,7 +524,7 @@ cifs_setup_request(struct cifs_ses *ses, struct kvec *iov, 
	rc = allocate_mid(ses, hdr, &mid);

	if (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)

		delete_mid(mid);

	*ret_mid = mid;