iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: Call find_fsid from find_fsid_inprogress

Browse Source 
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>
This commit is contained in:
Su Yue 2020-01-10 14:11:32 +02:00 committed by David Sterba
parent b5e4ff9d46
commit c0d81c7cb2
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/btrfs/volumes.c
View File

@ -672,7 +672,9 @@ error_brelse:
/* /*
* Handle scanned device having its CHANGING_FSID_V2 flag set and the 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( static struct btrfs_fs_devices *find_fsid_inprogress(
struct btrfs_super_block *disk_super) 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); BTRFS_SUPER_FLAG_CHANGING_FSID_V2);
if (fsid_change_in_progress) { if (fsid_change_in_progress) {
if (!has_metadata_uuid) { 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.
*/
fs_devices = find_fsid_inprogress(disk_super); fs_devices = find_fsid_inprogress(disk_super);
if (!fs_devices) else
fs_devices = find_fsid(disk_super->fsid, NULL);
} else {
fs_devices = find_fsid_changed(disk_super); fs_devices = find_fsid_changed(disk_super);
}
} else if (has_metadata_uuid) { } else if (has_metadata_uuid) {
fs_devices = find_fsid(disk_super->fsid, fs_devices = find_fsid(disk_super->fsid,
disk_super->metadata_uuid); disk_super->metadata_uuid);