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: 4855921 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 D92E6C0338 for ; Fri, 5 Sep 2014 22:58:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A766201F7 for ; Fri, 5 Sep 2014 22:58:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E42C20155 for ; Fri, 5 Sep 2014 22:58:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752718AbaIEW63 (ORCPT ); Fri, 5 Sep 2014 18:58:29 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33542 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470AbaIEW62 (ORCPT ); Fri, 5 Sep 2014 18:58:28 -0400 Received: by mail-pa0-f53.google.com with SMTP id fa1so22695847pad.26 for ; Fri, 05 Sep 2014 15:58:27 -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:mime-version:content-type :content-transfer-encoding; bh=XsLyADSgXSYH0MD/KuO6zknqHuNI6Sfm461J60k4qVM=; b=XYXzD8livqgf8xfdS6TIKHY5hmw5/dvtbALjFiP5iTxOxkyYgB3hKfvTsyD4kAKi6L RRMlpbPI0DS28WnDTFZSn6dV3F7ZgPymp1477wSrjtg2FSbb12/UWRpCAK18iV8Qr4PP xStyscWonbDYikNuJzuWzc7Zt46ok5gKWcceQ= 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:mime-version :content-type:content-transfer-encoding; bh=XsLyADSgXSYH0MD/KuO6zknqHuNI6Sfm461J60k4qVM=; b=c0lE1Q6fEtsh2glZGO+ECsU+Bc5NkNGQmqji7+nMwfmptus1Gi1FcfN0eCgqLCyfDm mCE0Qjt2N7HtT7Mw1wIx5lHnbeqVvkwBJlsfjO3SXJcdbKjQ2wcvvZY9nr9cQiIN8vHq KxARBB/LAnShLG+loFT5bWUFAR6HB/hibJ7eFQIuVqPlzuMLC7SSGKI+GsVAwJfKbY8s vhSM1OM6QHBGlIp7fCWLmrQHY9uQXTe1ArILTqoJwoMB6Y7yGQxMHSqQhjlRBOYRry7D zIw2Szgfv58avdfxJNUZH3ThiAkQvcMzOC4qyR6IFFgVw8VgfpKxPgai02PB5ykXbqdV +Zzg== X-Gm-Message-State: ALoCoQnA7smZ9ZTzIO6HJol+yUlUoLm8qYTl6t6+08Q86I3T9ybtBWQTBSKmghb+KjYOVIHBB9I3 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-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 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; }