diff options
author | Jeff Mahoney <jeffm@suse.com> | 2016-04-01 16:14:23 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-04-28 05:06:41 -0400 |
commit | d4ae133b2d195d88cf5394072724adfa6ccdd64b (patch) | |
tree | b32c840a68f3b3cd897e6e1fa4c89be52ff05362 | |
parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) |
btrfs: uapi/linux/btrfs.h migration, move BTRFS_LABEL_SIZE
BTRFS_LABEL_SIZE is required to define the BTRFS_IOC_GET_FSLABEL and
BTRFS_IOC_SET_FSLABEL ioctls.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/ctree.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/btrfs.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 84a6a5b3384a..3beaa24aff9b 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -410,7 +410,6 @@ struct btrfs_header { | |||
410 | * room to translate 14 chunks with 3 stripes each. | 410 | * room to translate 14 chunks with 3 stripes each. |
411 | */ | 411 | */ |
412 | #define BTRFS_SYSTEM_CHUNK_ARRAY_SIZE 2048 | 412 | #define BTRFS_SYSTEM_CHUNK_ARRAY_SIZE 2048 |
413 | #define BTRFS_LABEL_SIZE 256 | ||
414 | 413 | ||
415 | /* | 414 | /* |
416 | * just in case we somehow lose the roots and are not able to mount, | 415 | * just in case we somehow lose the roots and are not able to mount, |
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index dea893199257..11eee3439994 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #define BTRFS_IOCTL_MAGIC 0x94 | 24 | #define BTRFS_IOCTL_MAGIC 0x94 |
25 | #define BTRFS_VOL_NAME_MAX 255 | 25 | #define BTRFS_VOL_NAME_MAX 255 |
26 | #define BTRFS_LABEL_SIZE 256 | ||
26 | 27 | ||
27 | /* this should be 4k */ | 28 | /* this should be 4k */ |
28 | #define BTRFS_PATH_NAME_MAX 4087 | 29 | #define BTRFS_PATH_NAME_MAX 4087 |