diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 245952cf7650f70212139e9b918d630bc588e79a..f65b258344d487e94b345c0dce5a949084ff48a0 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -36,7 +36,7 @@ extern struct kmem_cache *btrfs_transaction_cachep;
 extern struct kmem_cache *btrfs_bit_radix_cachep;
 extern struct kmem_cache *btrfs_path_cachep;
 
-#define BTRFS_MAGIC "_B2RfS_M"
+#define BTRFS_MAGIC "_B3RfS_M"
 
 #define BTRFS_MAX_LEVEL 8
 #define BTRFS_ROOT_TREE_OBJECTID 1ULL
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 85ac42605f8d75685582368421e88f7ad1d90430..4b3bd24af72b07a4d4a1319c940839a261547e5c 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -454,7 +454,8 @@ static int btrfs_xattr_##name##_set(struct inode *inode,		\
 	if (*name == '\0')						\
 		return -EINVAL;						\
 	return btrfs_xattr_set(inode, index, name, value, size, flags);	\
-}									\
+}
+
 BTRFS_XATTR_SETGET_FUNCS(security, BTRFS_XATTR_INDEX_SECURITY);
 BTRFS_XATTR_SETGET_FUNCS(system, BTRFS_XATTR_INDEX_SYSTEM);
 BTRFS_XATTR_SETGET_FUNCS(user, BTRFS_XATTR_INDEX_USER);