History

btrfs: move definition of btrfs_raid_types to volumes.h

It's only internally used as another way to represent btrfs profiles, it's not exposed through any on-disk format, in fact this btrfs_raid_types is diverted from the on-disk format values. Furthermore, since it's internal structure, its definition can change in the future.

Qu Wenruo committed 4 years ago

Commit f04fbcc1 parent 385de0e3 files · +15 −13Browse files

Unified · Split

3 files
  1. fs/btrfs/space-info.h +2 −0
  2. fs/btrfs/volumes.h +13 −0
  3. include/uapi/linux/btrfs_tree.h +0 −13
fs/btrfs/space-info.h+2−0
@@ -3,6 +3,8 @@ · 2 unmodified lines
33 #ifndef BTRFS_SPACE_INFO_H
44 #define BTRFS_SPACE_INFO_H
55
6+#include "volumes.h"
7+
68 struct btrfs_space_info {
79 spinlock_t lock;
810
fs/btrfs/volumes.h+13−0
@@ -17,6 +17,19 @@ extern struct mutex uuid_mutex; · 16 unmodified lines
1717
1818 #define BTRFS_STRIPE_LEN SZ_64K
1919
20+enum btrfs_raid_types {
21+ BTRFS_RAID_RAID10,
22+ BTRFS_RAID_RAID1,
23+ BTRFS_RAID_DUP,
24+ BTRFS_RAID_RAID0,
25+ BTRFS_RAID_SINGLE,
26+ BTRFS_RAID_RAID5,
27+ BTRFS_RAID_RAID6,
28+ BTRFS_RAID_RAID1C3,
29+ BTRFS_RAID_RAID1C4,
30+ BTRFS_NR_RAID_TYPES
31+};
32+
2033 struct btrfs_io_geometry {
2134 /* remaining bytes before crossing a stripe */
2235 u64 len;
include/uapi/linux/btrfs_tree.h+0−13
@@ -880,19 +880,6 @@ struct btrfs_dev_replace_item { · 879 unmodified lines
880880 #define BTRFS_BLOCK_GROUP_RESERVED (BTRFS_AVAIL_ALLOC_BIT_SINGLE | \
881881 BTRFS_SPACE_INFO_GLOBAL_RSV)
882882
883−enum btrfs_raid_types {
884− BTRFS_RAID_RAID10,
885− BTRFS_RAID_RAID1,
886− BTRFS_RAID_DUP,
887− BTRFS_RAID_RAID0,
888− BTRFS_RAID_SINGLE,
889− BTRFS_RAID_RAID5,
890− BTRFS_RAID_RAID6,
891− BTRFS_RAID_RAID1C3,
892− BTRFS_RAID_RAID1C4,
893− BTRFS_NR_RAID_TYPES
894−};
895−
896883 #define BTRFS_BLOCK_GROUP_TYPE_MASK (BTRFS_BLOCK_GROUP_DATA | \
897884 BTRFS_BLOCK_GROUP_SYSTEM | \
898885 BTRFS_BLOCK_GROUP_METADATA)