From patchwork Wed Jul 18 17:58:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1212731 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id F373BDFFFD for ; Wed, 18 Jul 2012 17:59:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755258Ab2GRR7P (ORCPT ); Wed, 18 Jul 2012 13:59:15 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:54047 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755227Ab2GRR7P (ORCPT ); Wed, 18 Jul 2012 13:59:15 -0400 Received: by gglu4 with SMTP id u4so1863454ggl.19 for ; Wed, 18 Jul 2012 10:59:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=p7zyGUyS45nRtXpuIvZunIWCDiHVMK5yED2vQyH3ELM=; b=MmfdIAq3SEwsXmLnaCZiRXFNlgJdoCGKaed6S/RZhynORjcBLYC55Qgn5Tk6UXR8xt pcuY9Iv/KsIQgPaBqrFreftej7UrboIKlAkByUA+xxE7xrc6TY5CiGG3969pIwwwmLch D0l3yIl03/RalTIxAw7R4Iw4IpvFW/E0RdTPmzFVdm9g99A6jJZirr/N8/9m0m9u8rhl HtbxTeoW9nubMl7V/HyUSjZYWQcknRHrO++yu30rXow/40Xf4y92w3msSvktexUGI5Pb MbvS29XiMDavn9qKnCZ/SJX28uTpf59M2SKLQ+a8/+cUaHoWZPzKa6FxMVxXALr5ULYG fNng== Received: by 10.236.76.5 with SMTP id a5mr1826661yhe.8.1342634354552; Wed, 18 Jul 2012 10:59:14 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id e5sm20270107ani.18.2012.07.18.10.59.13 (version=SSLv3 cipher=OTHER); Wed, 18 Jul 2012 10:59:13 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH 02/11] cifs: rename cifs_sign_smb2 to cifs_sign_smbv Date: Wed, 18 Jul 2012 13:58:57 -0400 Message-Id: <1342634346-22818-3-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342634346-22818-1-git-send-email-jlayton@redhat.com> References: <1342634346-22818-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQn+DIUbcAN0ay86D3bUXBRXY3Hj9LC9x5OHLM2h1nPq76kGdD5k34LJ5u9aOrvtZw95Y4q9 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org "smb2" makes me think of the SMB2.x protocol, which isn't at all what this function is for... Signed-off-by: Jeff Layton Reviewed-by: Pavel Shilovsky --- fs/cifs/cifsencrypt.c | 4 ++-- fs/cifs/cifsproto.h | 2 +- fs/cifs/transport.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index db768cb..6a0d741 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, } /* 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 0a6cbfe..b09aa22 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -398,7 +398,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 fa51913..462130d 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -366,7 +366,7 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov, list_add_tail(&mid->qhead, &server->pending_mid_q); spin_unlock(&GlobalMid_Lock); - rc = cifs_sign_smb2(iov, nvec, server, &mid->sequence_number); + rc = cifs_sign_smbv(iov, nvec, server, &mid->sequence_number); if (rc) delete_mid(mid); *ret_mid = mid; @@ -522,7 +522,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;