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: 4903741 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E938EBEEA5 for ; Mon, 15 Sep 2014 07:38:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A101320166 for ; Mon, 15 Sep 2014 07:38:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BD3F20158 for ; Mon, 15 Sep 2014 07:38:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360AbaIOHb3 (ORCPT ); Mon, 15 Sep 2014 03:31:29 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:60774 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbaIOHb0 (ORCPT ); Mon, 15 Sep 2014 03:31:26 -0400 Received: by mail-pd0-f169.google.com with SMTP id fp1so5624721pdb.28 for ; Mon, 15 Sep 2014 00:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=converseincode.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=GLDWtzlVlC9B8uz6f804tS2ADovSUiC6A6vkafMqHjQ=; b=XWF0CDu+MC8n9wXqeHoFCiLkTbD+M9WC3iksGRCJo51aEeMtbdRg2Nm7AUHXWpBf5R xqtSiR05tD/1kiyRzSpJup5SwGT04/qvRSu7mnVCUnQXN8bWQhfolLvUHDrZV89IgO77 uZY14UzwOh9veSoptd++OynMGria6pS9obVz8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=GLDWtzlVlC9B8uz6f804tS2ADovSUiC6A6vkafMqHjQ=; b=d/Em82FEDfElFfRg0E3kyHKoHFggDBuP3yFOXA0mXTyHVfFHC2eKfx4UOCOidJOGiw qfZKpyMLyDikSjWqXESInh0IuvTdNExOFT8V5XWSclwXIYeO7xUI9wcaEXkYYeJ+CtJj z8YpjHEm+eLoogpX45ZG/Il4p4JyQhXR+X+Lp4YxkvYXIfyoLMCVFlsD5cNBbp/R3Hrp GkRoUxyxl5WIkq+ymepLDfqMjgV9w+wGNGojXylAoBmczcDvseKi6xoucqiLi5pXyOYa LNAqROiGHraR+buey6yzuuAkIPaJY7vCzppcBkcDzSX3Lo+EZjbpByL6GEzmkqJ442CW 61Iw== X-Gm-Message-State: ALoCoQmTvpgRqreHkBMANu/QlaVAAJYBBBgd/LjcGRWRClzottzDv4X0tFCN0wMWHNA6TrOBNBdJ 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-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 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; }