From patchwork Tue Mar 20 21:03:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10297905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6B944600F6 for ; Tue, 20 Mar 2018 21:03:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CA4629692 for ; Tue, 20 Mar 2018 21:03:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51B4829697; Tue, 20 Mar 2018 21:03:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04FEA29692 for ; Tue, 20 Mar 2018 21:03:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480AbeCTVDs (ORCPT ); Tue, 20 Mar 2018 17:03:48 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:39091 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751320AbeCTVDr (ORCPT ); Tue, 20 Mar 2018 17:03:47 -0400 Received: by mail-it0-f68.google.com with SMTP id e98-v6so4162217itd.4 for ; Tue, 20 Mar 2018 14:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gWBip2asfF4UB8ry4IAIih6rXC1bD3FWdlj/iye1xX8=; b=Xa9EdU7E+Dxv5h6DvfcCfIVpiKZ/FaWrN4et2DSCqv36RnoweCQbg5DQ1TasnVbJZf y3k92VhDSgGpsgj+l3vIJ9kiP+mYjxvwY/zWOMLWjvWlcOc6uCh9eI75M13uMnRtuhSN lCw5BvXUr4w0qA8Fj3uJ9y8LPDxO2nQPxV588+96G3P8Sp6N0mhdN9Iw3EABLhnKlWVZ Z2HuL0FvcRaOzoGd05jtMYmsBY+jYRd+reExQEh2wcTCShjm6dWNFUI7FCZ2jtHqAq0r jmTqa5C5ypKw7rVRkADamp08r8rzLV/IJ15o7wJMxPSXcCfOkZsa/1s2eShiFzddr7A6 pFSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gWBip2asfF4UB8ry4IAIih6rXC1bD3FWdlj/iye1xX8=; b=WWh6wOIDPUC5h2URr5OkOEGW8dt5vA/VLKj8ojyxSVk1JKIRpmrKS9WofC2Qh7VMc3 u92ioJ5N7tiL75YHlk/cmLnPIaEnqbQDsUhy4dMr66H1LuaFS57cYUQS/4FvBDqkQr45 QPEPZrU++hRsswOnQeqoxynNGzIoX0GNLJHHwzt7usSPpM4j7rLsGgKGu6gKLfdRpEar LkPU7FvdwiSt+zxyst44/2jOHFuCYGZKNgOClrbW+twaBtheD1nZ3TjW6EloLKQwdb93 lw5KaHtVZGF0fomRjEW00wpytt2/Y07OG0pSqB1OOr1BG4g80ZM2rEOsMHAgeiA1hhUq VaTA== X-Gm-Message-State: AElRT7GSpurSB/ajJVYI0ekD2n6WIxFZSoX8kUjlO9CVnJLXoEv5ShsH CgK5nNv+y5HqW1JKn/44s/Nx3hg= X-Google-Smtp-Source: AG47ELvQuSFYOZmS/Yj6SNg2O87wLHyuyz0wxYUeA3HRoQtz6snAJNzbwUUo/UrOOg1r1Lr2Ko0Vtg== X-Received: by 2002:a24:491:: with SMTP id 139-v6mr1386104itb.78.1521579826185; Tue, 20 Mar 2018 14:03:46 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id 28sm1781905ioj.8.2018.03.20.14.03.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Mar 2018 14:03:45 -0700 (PDT) From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH 5/9] NFSv4: Clean up encode_attrs Date: Tue, 20 Mar 2018 17:03:09 -0400 Message-Id: <20180320210313.94429-6-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180320210313.94429-5-trond.myklebust@primarydata.com> References: <20180320210313.94429-1-trond.myklebust@primarydata.com> <20180320210313.94429-2-trond.myklebust@primarydata.com> <20180320210313.94429-3-trond.myklebust@primarydata.com> <20180320210313.94429-4-trond.myklebust@primarydata.com> <20180320210313.94429-5-trond.myklebust@primarydata.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 80c5b519fd6a..3d088230c975 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -1052,9 +1052,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, int owner_namelen = 0; int owner_grouplen = 0; __be32 *p; - unsigned i; uint32_t len = 0; - uint32_t bmval_len; uint32_t bmval[3] = { 0 }; /* @@ -1123,19 +1121,8 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, bmval[2] |= FATTR4_WORD2_SECURITY_LABEL; } - if (bmval[2] != 0) - bmval_len = 3; - else if (bmval[1] != 0) - bmval_len = 2; - else - bmval_len = 1; - - p = reserve_space(xdr, 4 + (bmval_len << 2) + 4 + len); - - *p++ = cpu_to_be32(bmval_len); - for (i = 0; i < bmval_len; i++) - *p++ = cpu_to_be32(bmval[i]); - *p++ = cpu_to_be32(len); + xdr_encode_bitmap4(xdr, bmval, ARRAY_SIZE(bmval)); + xdr_stream_encode_opaque_inline(xdr, (void **)&p, len); if (bmval[0] & FATTR4_WORD0_SIZE) p = xdr_encode_hyper(p, iap->ia_size);