diff --git a/[refs] b/[refs]
index ceb74ca38d02..77d4c62d7b7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b114d1d33551ab1dcaa1d0b3a956df3776fb767
+refs/heads/master: 140dfd00ae544cdc0c9951b80ad6df61e62859e2
diff --git a/trunk/fs/btrfs/hash.c b/trunk/fs/btrfs/hash.c
index d5252f5c9d01..21037cfca9bd 100644
--- a/trunk/fs/btrfs/hash.c
+++ b/trunk/fs/btrfs/hash.c
@@ -81,7 +81,7 @@ u64 btrfs_name_hash(const char *name, int len)
 	__u32	hash;
 	__u32	minor_hash = 0;
 	const char	*p;
-	__u32		in[8], buf[2];
+	__u32		in[8], buf[4];
 	u64		hash_result;
 
 	if (len == 1 && *name == '.') {