From patchwork Thu Sep 24 12:57:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 7256471 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45861BEEC1 for ; Thu, 24 Sep 2015 12:57:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 510BF208B1 for ; Thu, 24 Sep 2015 12:57:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 641132082E for ; Thu, 24 Sep 2015 12:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753565AbbIXM5u (ORCPT ); Thu, 24 Sep 2015 08:57:50 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35350 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753294AbbIXM5u (ORCPT ); Thu, 24 Sep 2015 08:57:50 -0400 Received: by pacfv12 with SMTP id fv12so73917833pac.2 for ; Thu, 24 Sep 2015 05:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=nEKIfMrwhp5lhTm+BFh+dupje2cTDR2RgIdaCpZKjW0=; b=z0ObvFhCYHF+D9g7/Frm/kd2vPBCRs5iB0IZwNeDfX35hnxyLsV/AOjrCSq7rkZ9Hr FeetIC7mNFXJyqOWgBF6Plxz/LhAHXRKJP90Q2hAzGIpqLWFxHa3e5h2pJDXOIiHUEZr wGdiYI+SW/adGFt4+bsENJ7QkrGDvJsXMiBS9bBs6PWNBsTle1HYLasnr4ANI9RRBUd4 CxZw/0FUEnWFg9IwEQSoRKMq2XvvdQOoX6asoMC3g1R+9J6Vz2+PFp3RMVoGlEYhiIMR bcbENOS1Bg9T2PFtYGEHCe+XxXk/CY79F5O0/M1iWW/QxpJmjRm58I0cQSw0EAPfqH/3 5rHg== X-Received: by 10.68.173.130 with SMTP id bk2mr44730883pbc.169.1443099469572; Thu, 24 Sep 2015 05:57:49 -0700 (PDT) Received: from [192.168.99.26] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id dz7sm13709077pab.16.2015.09.24.05.57.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 05:57:49 -0700 (PDT) Subject: [PATCH 5/8] NFS: Use NFS4_MAX_SESSIONID_LEN directly for decode/encode sessionid To: Trond Myklebust References: <5603F269.9060102@gmail.com> Cc: "linux-nfs@vger.kernel.org" , kinglongmee@gmail.com From: Kinglong Mee Message-ID: <5603F341.1050605@gmail.com> Date: Thu, 24 Sep 2015 20:57:37 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <5603F269.9060102@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's no need to define a temporary variables for NFS4_MAX_SESSIONID_LEN. Signed-off-by: Kinglong Mee --- fs/nfs/callback_xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index e87d7f0..09aeb9a 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -380,13 +380,12 @@ static __be32 decode_sessionid(struct xdr_stream *xdr, struct nfs4_sessionid *sid) { __be32 *p; - int len = NFS4_MAX_SESSIONID_LEN; - p = read_buf(xdr, len); + p = read_buf(xdr, NFS4_MAX_SESSIONID_LEN); if (unlikely(p == NULL)) return htonl(NFS4ERR_RESOURCE); - memcpy(sid->data, p, len); + memcpy(sid->data, p, NFS4_MAX_SESSIONID_LEN); return 0; } @@ -679,13 +678,12 @@ static __be32 encode_sessionid(struct xdr_stream *xdr, const struct nfs4_sessionid *sid) { __be32 *p; - int len = NFS4_MAX_SESSIONID_LEN; - p = xdr_reserve_space(xdr, len); + p = xdr_reserve_space(xdr, NFS4_MAX_SESSIONID_LEN); if (unlikely(p == NULL)) return htonl(NFS4ERR_RESOURCE); - memcpy(p, sid, len); + memcpy(p, sid, NFS4_MAX_SESSIONID_LEN); return 0; }