Commit c0d81c7c authored by Su Yue's avatar Su Yue Committed by David Sterba
Browse files

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: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarSu Yue <Damenly_Su@gmx.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b5e4ff9d

fs/btrfs/volumes.c

+6 −13
Original line number Diff line number Diff line
@@ -672,7 +672,9 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, 


/*

 * 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);