Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0458a953 authored by Vinícius Tinti's avatar Vinícius Tinti Committed by Behan Webster
Browse files

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: default avatarVinícius Tinti <viniciustinti@gmail.com>
Reviewed-by: default avatarJan-Simon Möller <dl9pf@gmx.de>
Reviewed-by: default avatarMark Charlebois <charlebm@gmail.com>
Signed-off-by: default avatarBehan Webster <behanw@converseincode.com>
Acked-by: default avatarChris Mason <clm@fb.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
parent a0a77af1

fs/btrfs/hash.c

+7 −9
Original line number 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)

{

	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;

}