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>

diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index db768cb67e3859834a42152e06dcff713dce07e9..6a0d741159f0d1474f6e51924b9cedc93b800d84 100644 (file)
--- 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,
 }
 
 /* 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);
 }
 

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index baa1b6dc838eb193c0d91533b577d096752674ef..613320c9a7809c9321fbcb5f4a9d5380cc0b9982 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -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,

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index fdda15a6a803d63af77edeb976201ad109263aea..3e6ffe355384a102b06e8a048683067cf2b9ff9a 100644 (file)
--- 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,
        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;