Commit 0458a953 authored Apr 04, 2014 by Vinícius Tinti Committed by Behan Webster Oct 14, 2014

btrfs: LLVMLinux: Remove VLAIS



Replaced the use of a Variable Length Array In Struct (VLAIS) with a C99
compliant equivalent.  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 <viniciustinti@gmail.com>
Reviewed-by: Jan-Simon Möller <dl9pf@gmx.de>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Acked-by: Chris Mason <clm@fb.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>

parent a0a77af1

fs/btrfs/hash.c

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -31,18 +31,16 @@ void btrfs_hash_exit(void)

	u32 btrfs_crc32c(u32 crc, const void *address, unsigned int length)		u32 btrfs_crc32c(u32 crc, const void *address, unsigned int length)
	{		{
	struct {		SHASH_DESC_ON_STACK(shash, tfm);
	struct shash_desc shash;		u32 ctx = (u32 )shash_desc_ctx(shash);
	char ctx[crypto_shash_descsize(tfm)];
	} desc;
	int err;		int err;

	desc.shash.tfm = tfm;		shash->tfm = tfm;
	desc.shash.flags = 0;		shash->flags = 0;
	(u32 )desc.ctx = crc;		*ctx = crc;

	err = crypto_shash_update(&desc.shash, address, length);		err = crypto_shash_update(shash, address, length);
	BUG_ON(err);		BUG_ON(err);

	return (u32 )desc.ctx;		return *ctx;
	}		}

Admin message