zygo: btrfs: set super_num_devices

(cherry picked from commit ac5c7d500c60c460ebc659bb794c2b46c1a31497)
(cherry picked from commit 253cbcb7e19750240362a156c517b6213b958d4d)
(cherry picked from commit 8fa40c4f82c637969b2bac80ef5c524017ce054e)
(cherry picked from commit edf2d8af02e7fb727b466e1018b5c5d2fc48f5a0)
(cherry picked from commit 62f701457f2a1f4cad83353cde134caefbb1a354)
(cherry picked from commit 155c85ff96b3bc2caaf561604a28b337fca19022)
(cherry picked from commit a573ae419c83a3a45952a97b5aae0e322218bf0e)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b8fab44394f5a5a4666a769a60de3d8cdc3c3516..e0c3fe3f32e0a3e3d8a8546fdf636a9c6d20cfa5 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -7376,8 +7376,7 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)
           "super_num_devices %llu mismatch with num_devices %llu found here",
                          btrfs_super_num_devices(fs_info->super_copy),
                          total_dev);
-               ret = -EINVAL;
-               goto error;
+               btrfs_set_super_num_devices(fs_info->super_copy, total_dev);
        }
        if (btrfs_super_total_bytes(fs_info->super_copy) <
            fs_info->fs_devices->total_rw_bytes) {