Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 035fe03a7ad56982b30ab3a522b7b08d58feccd0

Authored by Josef Bacik
Committed by Chris Mason
1 parent 7f59203abe
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Btrfs: check total number of devices when removing missing 

If you have a disk failure in RAID1 and then add a new disk to the
array, and then try to remove the missing volume, it will fail.  The
reason is the sanity check only looks at the total number of rw devices,
which is just 2 because we have 2 good disks and 1 bad one.  Instead
check the total number of devices in the array to make sure we can
actually remove the device.  Tested this with a failed disk setup and
with this test we can now run

btrfs-vol -r missing /mount/point

and it works fine.

Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -1135,7 +1135,7 @@
1135 1135 root->fs_info->avail_metadata_alloc_bits;
1136 1136  
1137 1137 if ((all_avail & BTRFS_BLOCK_GROUP_RAID10) &&
1138   - root->fs_info->fs_devices->rw_devices <= 4) {
  1138 + root->fs_info->fs_devices->num_devices <= 4) {
1139 1139 printk(KERN_ERR "btrfs: unable to go below four devices "
1140 1140 "on raid10\n");
1141 1141 ret = -EINVAL;
... ... @@ -1143,7 +1143,7 @@
1143 1143 }
1144 1144  
1145 1145 if ((all_avail & BTRFS_BLOCK_GROUP_RAID1) &&
1146   - root->fs_info->fs_devices->rw_devices <= 2) {
  1146 + root->fs_info->fs_devices->num_devices <= 2) {
1147 1147 printk(KERN_ERR "btrfs: unable to go below two "
1148 1148 "devices on raid1\n");
1149 1149 ret = -EINVAL;