From patchwork Mon Sep 15 07:30:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 37400 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7A14B206A5 for ; Mon, 15 Sep 2014 07:31:56 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf1977411eek.3 for ; Mon, 15 Sep 2014 00:31:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=P7/3+iIERmNnFXpYEDsxRhaFDakytpDQvcsbYsahsDs=; b=S+NP1itS7nCFvl6SHWV6oltCJW3Hvo503UA8QTZDSzb4R1zQCLdsSqbzdID6ReHFsU baVHrbWHDlSqdMbR7h6dldIk7wqS2kSJruTkOXNAXN5HdNEu11F3kpQybk8sx5776Uf0 ZdpXJnkPhIyqLfjIuminyEoNFnp0tpY7KzfV5Twvkr3Je3LOVcFI+BG6/ayWqIPEQSVG WyEOzdzIig/9Ug5Pv/cZDc/ypYPrXjKwWxAJ/ZXGI/pydCGJw/y9F9CQxwAz1sCYSSeK FWqIqMS5Zwv+GwEQ3HcoOHhejLgvUYVpq6alqqPir1mzCE8rzAJxNIU79uSOZQUOCf7t uYcw== X-Gm-Message-State: ALoCoQnRDBuN0WQK+v1SqY3cKrN6i+UziA8LTTEoSrmOk2/KnOBvyRR+xYxnoCbJ3wp6QQWM9Dfn X-Received: by 10.194.205.138 with SMTP id lg10mr313011wjc.5.1410766315377; Mon, 15 Sep 2014 00:31:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.171 with SMTP id p11ls278036lal.68.gmail; Mon, 15 Sep 2014 00:31:55 -0700 (PDT) X-Received: by 10.112.202.1 with SMTP id ke1mr24854794lbc.33.1410766315188; Mon, 15 Sep 2014 00:31:55 -0700 (PDT) Received: from mail-la0-x232.google.com (mail-la0-x232.google.com [2a00:1450:4010:c03::232]) by mx.google.com with ESMTPS id y4si17484473lae.130.2014.09.15.00.31.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Sep 2014 00:31:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::232 as permitted sender) client-ip=2a00:1450:4010:c03::232; Received: by mail-la0-f50.google.com with SMTP id ty20so4060043lab.23 for ; Mon, 15 Sep 2014 00:31:54 -0700 (PDT) X-Received: by 10.112.163.103 with SMTP id yh7mr6842909lbb.73.1410766314815; Mon, 15 Sep 2014 00:31:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp161622lbb; Mon, 15 Sep 2014 00:31:54 -0700 (PDT) X-Received: by 10.66.220.40 with SMTP id pt8mr9840674pac.108.1410766313201; Mon, 15 Sep 2014 00:31:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ra1si21020713pbb.187.2014.09.15.00.31.52 for ; Mon, 15 Sep 2014 00:31:53 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365AbaIOHbb (ORCPT + 27 others); Mon, 15 Sep 2014 03:31:31 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:37985 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753343AbaIOHb0 (ORCPT ); Mon, 15 Sep 2014 03:31:26 -0400 Received: by mail-pa0-f53.google.com with SMTP id rd3so5815145pab.12 for ; Mon, 15 Sep 2014 00:31:25 -0700 (PDT) X-Received: by 10.66.227.71 with SMTP id ry7mr36108701pac.32.1410766285673; Mon, 15 Sep 2014 00:31:25 -0700 (PDT) Received: from galdor.edimax.com ([38.126.120.10]) by mx.google.com with ESMTPSA id cz1sm1011611pdb.85.2014.09.15.00.31.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Sep 2014 00:31:24 -0700 (PDT) From: behanw@converseincode.com To: agk@redhat.com, clm@fb.com, davem@davemloft.net, dm-devel@redhat.com, fabf@skynet.be, herbert@gondor.apana.org.au, jbacik@fb.com, snitzer@redhat.com, tadeusz.struk@intel.com Cc: akpm@linux-foundation.org, bruce.w.allan@intel.com, d.kasatkin@samsung.com, james.l.morris@oracle.com, john.griffin@intel.com, linux-btrfs@vger.kernel.org, linux-crypto@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-security-module@vger.kernel.org, neilb@suse.de, qat-linux@intel.com, serge@hallyn.com, thomas.lendacky@amd.com, zohar@linux.vnet.ibm.com, torvalds@linux-foundation.org, =?UTF-8?q?Vin=C3=ADcius=20Tinti?= , Behan Webster Subject: [PATCH v3 02/12] btrfs: LLVMLinux: Remove VLAIS Date: Mon, 15 Sep 2014 00:30:24 -0700 Message-Id: <1410766234-1634-3-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1410766234-1634-1-git-send-email-behanw@converseincode.com> References: <1410766234-1634-1-git-send-email-behanw@converseincode.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: behanw@converseincode.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::232 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@ Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Vinícius Tinti Replaced the use of a Variable Length Array In Struct (VLAIS) with a C99 compliant equivalent. This is the original VLAIS struct. struct { struct shash_desc shash; char ctx[crypto_shash_descsize(tfm)]; } desc; This patch instead allocates the appropriate amount of memory using a char array using the SHASH_DESC_ON_STACK macro. The new code can be compiled with both gcc and clang. Signed-off-by: Vinícius Tinti Reviewed-by: Jan-Simon Möller Reviewed-by: Mark Charlebois Signed-off-by: Behan Webster Cc: "David S. Miller" Cc: Herbert Xu Acked-by: Chris Mason --- fs/btrfs/hash.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/fs/btrfs/hash.c b/fs/btrfs/hash.c index 85889aa..4bf4d3a 100644 --- a/fs/btrfs/hash.c +++ b/fs/btrfs/hash.c @@ -33,18 +33,16 @@ void btrfs_hash_exit(void) u32 btrfs_crc32c(u32 crc, const void *address, unsigned int length) { - struct { - struct shash_desc shash; - char ctx[crypto_shash_descsize(tfm)]; - } desc; + SHASH_DESC_ON_STACK(shash, tfm); + u32 *ctx = (u32 *)shash_desc_ctx(shash); int err; - desc.shash.tfm = tfm; - desc.shash.flags = 0; - *(u32 *)desc.ctx = crc; + shash->tfm = tfm; + shash->flags = 0; + *ctx = crc; - err = crypto_shash_update(&desc.shash, address, length); + err = crypto_shash_update(shash, address, length); BUG_ON(err); - return *(u32 *)desc.ctx; + return *ctx; }