Revert "btrfs: LLVMLinux: Remove VLAIS"

This reverts commit f6dfc779e641cda277e46fd3be5e5d3b18a3aa9c.

diff --git a/fs/btrfs/hash.c b/fs/btrfs/hash.c
index aae520b2aee535f069946ba332b83a3ab0d44644..64f15bb30a81dbf9ada217d4e0c09cd74fddb197 100644 (file)
--- a/fs/btrfs/hash.c
+++ b/fs/btrfs/hash.c
@@ -31,16 +31,18 @@ void btrfs_hash_exit(void)
 
 u32 btrfs_crc32c(u32 crc, const void *address, unsigned int length)
 {
-       SHASH_DESC_ON_STACK(shash, tfm);
-       u32 *ctx = (u32 *)shash_desc_ctx(shash);
+       struct {
+               struct shash_desc shash;
+               char ctx[crypto_shash_descsize(tfm)];
+       } desc;
        int err;
 
-       shash->tfm = tfm;
-       shash->flags = 0;
-       *ctx = crc;
+       desc.shash.tfm = tfm;
+       desc.shash.flags = 0;
+       *(u32 *)desc.ctx = crc;
 
-       err = crypto_shash_update(shash, address, length);
+       err = crypto_shash_update(&desc.shash, address, length);
        BUG_ON(err);
 
-       return *ctx;
+       return *(u32 *)desc.ctx;
 }