diff --git a/[refs] b/[refs]
index c17839595e00..7459fcb3f833 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a9918497bcf5aaa8d45eb61c373605bc4e8c81f
+refs/heads/master: 3108b54bcedde5d952c90460df5bc21efc1e134f
diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h
index 1610e808ebe3..e8e8afa402f1 100644
--- a/trunk/fs/ext4/ext4.h
+++ b/trunk/fs/ext4/ext4.h
@@ -1667,10 +1667,12 @@ static inline u32 ext4_chksum(struct ext4_sb_info *sbi, u32 crc,
 {
 	struct {
 		struct shash_desc shash;
-		char ctx[crypto_shash_descsize(sbi->s_chksum_driver)];
+		char ctx[4];
 	} desc;
 	int err;
 
+	BUG_ON(crypto_shash_descsize(sbi->s_chksum_driver)!=sizeof(desc.ctx));
+
 	desc.shash.tfm = sbi->s_chksum_driver;
 	desc.shash.flags = 0;
 	*(u32 *)desc.ctx = crc;