diff options
| author | David Sterba <dsterba@suse.com> | 2019-05-31 16:54:26 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-07-02 12:30:48 +0200 |
| commit | a07e8a468e6a2f626b61078a4d1e63c181f099eb (patch) | |
| tree | 39dfd45948167335bf329ce73f0de4007dd91581 | |
| parent | c7369b3faea230cf6009449147ed755c45e74afd (diff) | |
| download | linux-a07e8a468e6a2f626b61078a4d1e63c181f099eb.tar.gz linux-a07e8a468e6a2f626b61078a4d1e63c181f099eb.tar.bz2 linux-a07e8a468e6a2f626b61078a4d1e63c181f099eb.zip | |
btrfs: use mask for RAID56 profiles
We don't need to enumerate the profiles, use the mask for consistency.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 13c17f94f15d..99fae9e4ab71 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7874,8 +7874,7 @@ search: if (!block_group_bits(block_group, flags)) { u64 extra = BTRFS_BLOCK_GROUP_DUP | BTRFS_BLOCK_GROUP_RAID1_MASK | - BTRFS_BLOCK_GROUP_RAID5 | - BTRFS_BLOCK_GROUP_RAID6 | + BTRFS_BLOCK_GROUP_RAID56_MASK | BTRFS_BLOCK_GROUP_RAID10; /* @@ -9562,8 +9561,7 @@ static u64 update_block_group_flags(struct btrfs_fs_info *fs_info, u64 flags) num_devices = fs_info->fs_devices->rw_devices; - stripped = BTRFS_BLOCK_GROUP_RAID0 | - BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6 | + stripped = BTRFS_BLOCK_GROUP_RAID0 | BTRFS_BLOCK_GROUP_RAID56_MASK | BTRFS_BLOCK_GROUP_RAID1_MASK | BTRFS_BLOCK_GROUP_RAID10; if (num_devices == 1) { @@ -10446,8 +10444,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) if (!(get_alloc_profile(info, space_info->flags) & (BTRFS_BLOCK_GROUP_RAID10 | BTRFS_BLOCK_GROUP_RAID1_MASK | - BTRFS_BLOCK_GROUP_RAID5 | - BTRFS_BLOCK_GROUP_RAID6 | + BTRFS_BLOCK_GROUP_RAID56_MASK | BTRFS_BLOCK_GROUP_DUP))) continue; /* |