diff options
-rw-r--r-- | fs/btrfs/ctree.h | 2 | ||||
-rw-r--r-- | fs/btrfs/xattr.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 245952cf7650..f65b258344d4 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -36,7 +36,7 @@ extern struct kmem_cache *btrfs_transaction_cachep; | |||
36 | extern struct kmem_cache *btrfs_bit_radix_cachep; | 36 | extern struct kmem_cache *btrfs_bit_radix_cachep; |
37 | extern struct kmem_cache *btrfs_path_cachep; | 37 | extern struct kmem_cache *btrfs_path_cachep; |
38 | 38 | ||
39 | #define BTRFS_MAGIC "_B2RfS_M" | 39 | #define BTRFS_MAGIC "_B3RfS_M" |
40 | 40 | ||
41 | #define BTRFS_MAX_LEVEL 8 | 41 | #define BTRFS_MAX_LEVEL 8 |
42 | #define BTRFS_ROOT_TREE_OBJECTID 1ULL | 42 | #define BTRFS_ROOT_TREE_OBJECTID 1ULL |
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 85ac42605f8d..4b3bd24af72b 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c | |||
@@ -454,7 +454,8 @@ static int btrfs_xattr_##name##_set(struct inode *inode, \ | |||
454 | if (*name == '\0') \ | 454 | if (*name == '\0') \ |
455 | return -EINVAL; \ | 455 | return -EINVAL; \ |
456 | return btrfs_xattr_set(inode, index, name, value, size, flags); \ | 456 | return btrfs_xattr_set(inode, index, name, value, size, flags); \ |
457 | } \ | 457 | } |
458 | |||
458 | BTRFS_XATTR_SETGET_FUNCS(security, BTRFS_XATTR_INDEX_SECURITY); | 459 | BTRFS_XATTR_SETGET_FUNCS(security, BTRFS_XATTR_INDEX_SECURITY); |
459 | BTRFS_XATTR_SETGET_FUNCS(system, BTRFS_XATTR_INDEX_SYSTEM); | 460 | BTRFS_XATTR_SETGET_FUNCS(system, BTRFS_XATTR_INDEX_SYSTEM); |
460 | BTRFS_XATTR_SETGET_FUNCS(user, BTRFS_XATTR_INDEX_USER); | 461 | BTRFS_XATTR_SETGET_FUNCS(user, BTRFS_XATTR_INDEX_USER); |