From patchwork Fri Sep 5 22:58:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 36900 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2CCA8202A1 for ; Fri, 5 Sep 2014 22:58:34 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wn1sf62590583obc.2 for ; Fri, 05 Sep 2014 15:58:33 -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 :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=VY/HCmsl0Um0YjI8G28knLWupIefgy7B5liePt1qxG8=; b=Ibp45m+K/RQ9m+ekN+nl48yscF7LW+Txq9YbaISe6l43hFAtb/H2b2MWEwaad9f5cR GTmKXN7tX/znNr5zthJbbTTRst2rv8XXnpsuSHfjoPOZtn93XgLSM6TEWCfXPWntNmLD myZSfu1Mu4JswYuERuHM6mLNF+jZis+fcdJBxWf4Y/AJrxHoPF5kNlqXgdQymwq7nVqb 3fO7uboesrGiNeQdm792iPSYukeOe2149VgVE2dY40tTrLxTxp42yrDJqWfawPxv+Y5/ VyvIQsU81ARSeRFmKkNe+ydrf8Yl2SUo7bG6jBPkfrWQBdpp/FZrudoKyIWQpzg1TCAx RPNw== X-Gm-Message-State: ALoCoQmMQtzbUj7bp7y72g03peAk6zYHNsKHlrB80qrOQUYj7slSe599KgRezMpy9JgjVF6uLV3G X-Received: by 10.42.210.17 with SMTP id gi17mr8611783icb.1.1409957913749; Fri, 05 Sep 2014 15:58:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.171 with SMTP id o40ls467928qga.28.gmail; Fri, 05 Sep 2014 15:58:33 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr9867013vdb.25.1409957913655; Fri, 05 Sep 2014 15:58:33 -0700 (PDT) Received: from mail-vc0-x229.google.com (mail-vc0-x229.google.com [2607:f8b0:400c:c03::229]) by mx.google.com with ESMTPS id jx6si2086137vdb.102.2014.09.05.15.58.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 15:58:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::229 as permitted sender) client-ip=2607:f8b0:400c:c03::229; Received: by mail-vc0-f169.google.com with SMTP id hq11so13342025vcb.28 for ; Fri, 05 Sep 2014 15:58:33 -0700 (PDT) X-Received: by 10.52.102.204 with SMTP id fq12mr10865088vdb.26.1409957913503; Fri, 05 Sep 2014 15:58:33 -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.221.45.67 with SMTP id uj3csp148101vcb; Fri, 5 Sep 2014 15:58:32 -0700 (PDT) X-Received: by 10.70.96.200 with SMTP id du8mr8072260pdb.117.1409957912356; Fri, 05 Sep 2014 15:58:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ua10si6233726pac.145.2014.09.05.15.58.31 for ; Fri, 05 Sep 2014 15:58:32 -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 S1753872AbaIEW6a (ORCPT + 26 others); Fri, 5 Sep 2014 18:58:30 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33258 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751684AbaIEW62 (ORCPT ); Fri, 5 Sep 2014 18:58:28 -0400 Received: by mail-pa0-f50.google.com with SMTP id kq14so23033263pab.23 for ; Fri, 05 Sep 2014 15:58:27 -0700 (PDT) X-Received: by 10.70.61.106 with SMTP id o10mr27353595pdr.16.1409957907687; Fri, 05 Sep 2014 15:58:27 -0700 (PDT) Received: from galdor.websterwood.com (S0106dc9fdb80cffd.gv.shawcable.net. [96.50.97.138]) by mx.google.com with ESMTPSA id z3sm2581211pbt.84.2014.09.05.15.58.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Sep 2014 15:58:26 -0700 (PDT) From: behanw@converseincode.com To: clm@fb.com, jbacik@fb.com Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Vin=C3=ADcius=20Tinti?= , =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= , Behan Webster , Mark Charlebois Subject: [PATCH v2] btrfs: LLVMLinux: Remove VLAIS Date: Fri, 5 Sep 2014 15:58:21 -0700 Message-Id: <1409957901-28962-1-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 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 2607:f8b0:400c:c03::229 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 an char array. The new code can be compiled with both gcc and clang. struct shash_desc contains a flexible array member member ctx declared with CRYPTO_MINALIGN_ATTR, so sizeof(struct shash_desc) aligns the beginning of the array declared after struct shash_desc with long long. No trailing padding is required because it is not a struct type that can be used in an array. The CRYPTO_MINALIGN_ATTR is required so that desc is aligned with long long as would be the case for a struct containing a member with CRYPTO_MINALIGN_ATTR. Signed-off-by: Jan-Simon Möller Signed-off-by: Behan Webster Signed-off-by: Vinícius Tinti Signed-off-by: Mark Charlebois --- fs/btrfs/hash.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/btrfs/hash.c b/fs/btrfs/hash.c index 85889aa..a62743f 100644 --- a/fs/btrfs/hash.c +++ b/fs/btrfs/hash.c @@ -33,18 +33,18 @@ 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; + char desc[sizeof(struct shash_desc) + + crypto_shash_descsize(tfm)] CRYPTO_MINALIGN_ATTR; + struct shash_desc *shash = (struct shash_desc *)desc; + 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; }