btrfs: Call find_fsid from find_fsid_inprogress

Since find_fsid_inprogress should also handle the case in which an fs
didn't change its FSID make it call find_fsid directly. This makes the
code in device_list_add simpler by eliminating a conditional call of
find_fsid. No functional changes.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Su Yue <Damenly_Su@gmx.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index ab1b3c35c5eb35b83dbccd1ffe47ab7406df41ae..d9957688338bc207d3cd99c027630e181758b410 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -672,7 +672,9 @@ error_brelse:
 
 /*
  * Handle scanned device having its CHANGING_FSID_V2 flag set and the fs_devices
- * being created with a disk that has already completed its fsid change.
+ * being created with a disk that has already completed its fsid change. Such
+ * disk can belong to an fs which has its FSID changed or to one which doesn't.
+ * Handle both cases here.
  */
 static struct btrfs_fs_devices *find_fsid_inprogress(
                                        struct btrfs_super_block *disk_super)
@@ -688,7 +690,7 @@ static struct btrfs_fs_devices *find_fsid_inprogress(
                }
        }
 
-       return NULL;
+       return find_fsid(disk_super->fsid, NULL);
 }
 
 
@@ -737,19 +739,10 @@ static noinline struct btrfs_device *device_list_add(const char *path,
                                        BTRFS_SUPER_FLAG_CHANGING_FSID_V2);
 
        if (fsid_change_in_progress) {
-               if (!has_metadata_uuid) {
-                       /*
-                        * When we have an image which has CHANGING_FSID_V2 set
-                        * it might belong to either a filesystem which has
-                        * disks with completed fsid change or it might belong
-                        * to fs with no UUID changes in effect, handle both.
-                        */
+               if (!has_metadata_uuid)
                        fs_devices = find_fsid_inprogress(disk_super);
-                       if (!fs_devices)
-                               fs_devices = find_fsid(disk_super->fsid, NULL);
-               } else {
+               else
                        fs_devices = find_fsid_changed(disk_super);
-               }
        } else if (has_metadata_uuid) {
                fs_devices = find_fsid(disk_super->fsid,
                                       disk_super->metadata_uuid);