Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07e8a46 authored by David Sterba's avatar David Sterba
Browse files

btrfs: use mask for RAID56 profiles 



We don't need to enumerate the profiles, use the mask for consistency.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c7369b3f

fs/btrfs/extent-tree.c

+3 −6
Original line number Diff line number Diff line
@@ -7874,8 +7874,7 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info, 
		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;

		/*