btrfs: refactor with memcmp_fsid_fs_devices helper
PATCH 6/9 btrfs: refactor with memcmp_fsid_fs_devices helper
In reply to a message not in the archiveRefactor the functions find_fsid() and find_fsid_with_metadata_uuid(), as they currently share a common set of code to compare the fsid and metadata_uuid. Create a common helper function, memcmp_fsid_fs_devices().
Signed-off-by Anand Jain <[email protected]>
--- fs/btrfs/volumes.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-)
fs/btrfs/volumes.c +25 -15
@@ -427,6 +427,22 @@ void __exit btrfs_cleanup_fs_uuids(void) } } +static bool memcmp_fsid_fs_devices (struct btrfs_fs_devices *fs_devices, +const u8 *fsid,const u8 *metadata_fsid) +{ +if (memcmp (fsid, fs_devices->fsid,BTRFS_FSID_SIZE ) !=0 ) +return false; + +if (!metadata_fsid) +return true; + +if (memcmp (metadata_fsid, fs_devices->metadata_uuid,BTRFS_FSID_SIZE ) != +0 ) +return false; + +return true; +} + static noinline struct btrfs_fs_devices *find_fsid(const u8 *fsid,const u8 *metadata_fsid) {
@@ -436,15 +452,8 @@ static noinline struct btrfs_fs_devices *find_fsid(/* Handle non-split brain cases */ list_for_each_entry (fs_devices, &fs_uuids, fs_list) { -if (metadata_fsid) { -if (memcmp (fsid, fs_devices->fsid,BTRFS_FSID_SIZE ) ==0 - &&memcmp (metadata_fsid, fs_devices->metadata_uuid, -BTRFS_FSID_SIZE ) ==0 ) -return fs_devices; - }else { -if (memcmp (fsid, fs_devices->fsid,BTRFS_FSID_SIZE ) ==0 ) -return fs_devices; - } +if (memcmp_fsid_fs_devices (fs_devices, fsid, metadata_fsid)) +return fs_devices; }return NULL ; }
@@ -462,14 +471,15 @@ static struct btrfs_fs_devices *find_fsid_with_metadata_uuid(* at all and the CHANGING_FSID_V2 flag set. */ list_for_each_entry (fs_devices, &fs_uuids, fs_list) { -if (fs_devices->fsid_change && -memcmp (disk_super->metadata_uuid, fs_devices->fsid, -BTRFS_FSID_SIZE ) ==0 && -memcmp (fs_devices->fsid, fs_devices->metadata_uuid, -BTRFS_FSID_SIZE ) ==0 ) { +if (!fs_devices->fsid_change) +continue ; + +if (memcmp_fsid_fs_devices (fs_devices, + disk_super->metadata_uuid, + fs_devices->fsid))return fs_devices; - } } +/* * Handle scanned device having completed its fsid change but * belonging to a fs_devices that was created by a device that
Signature · 1 line
2.38.1
PATCH 7/9 btrfs: refactor with memcmp_fsid_changed helper
In reply to a message not in the archiveWe often check if the metadata_uuid is not the same as fsid, and then we check if the given fsid matches the metadata_uuid. This patch refactors this logic into a function and utilize it.
Signed-off-by Anand Jain <[email protected]>
--- fs/btrfs/volumes.c | 48 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-)
fs/btrfs/volumes.c +27 -21
@@ -458,6 +458,20 @@ static noinline struct btrfs_fs_devices *find_fsid(return NULL ; } +/* +* First, checks if the metadata_uuid is different from the fsid in the +* given fs_devices. Then, checks if the given fsid is the same as the +* metadata_uuid in the fs_devices. If it is, returns true; otherwise, +* returns false. +*/ +static inline bool memcmp_fsid_changed (struct btrfs_fs_devices *fs_devices, +u8 *fsid) +{ +return (memcmp (fs_devices->fsid, fs_devices->metadata_uuid, +BTRFS_FSID_SIZE ) !=0 && +memcmp (fs_devices->metadata_uuid, fsid,BTRFS_FSID_SIZE ) ==0 ); +} +static struct btrfs_fs_devices *find_fsid_with_metadata_uuid (struct btrfs_super_block *disk_super) {
@@ -487,13 +501,11 @@ static struct btrfs_fs_devices *find_fsid_with_metadata_uuid(* CHANGING_FSID_V2 flag set. */ list_for_each_entry (fs_devices, &fs_uuids, fs_list) { -if (fs_devices->fsid_change && -memcmp (fs_devices->metadata_uuid, - fs_devices->fsid,BTRFS_FSID_SIZE ) !=0 && -memcmp (disk_super->metadata_uuid, fs_devices->metadata_uuid, -BTRFS_FSID_SIZE ) ==0 ) { +if (!fs_devices->fsid_change) +continue ; + +if (memcmp_fsid_changed (fs_devices, disk_super->metadata_uuid))return fs_devices; - } }return find_fsid (disk_super->fsid, disk_super->metadata_uuid);
@@ -684,18 +696,16 @@ static struct btrfs_fs_devices *find_fsid_inprogress(struct btrfs_fs_devices *fs_devices;list_for_each_entry (fs_devices, &fs_uuids, fs_list) { -if (memcmp (fs_devices->metadata_uuid, fs_devices->fsid, -BTRFS_FSID_SIZE ) !=0 && -memcmp (fs_devices->metadata_uuid, disk_super->fsid, -BTRFS_FSID_SIZE ) ==0 && !fs_devices->fsid_change) { +if (fs_devices->fsid_change) +continue ; + +if (memcmp_fsid_changed (fs_devices, disk_super->fsid))return fs_devices; - } }return find_fsid (disk_super->fsid,NULL ); } -static struct btrfs_fs_devices *find_fsid_changed (struct btrfs_super_block *disk_super) {
@@ -712,10 +722,7 @@ static struct btrfs_fs_devices *find_fsid_changed(*/ list_for_each_entry (fs_devices, &fs_uuids, fs_list) {/* Changed UUIDs */ -if (memcmp (fs_devices->metadata_uuid, fs_devices->fsid, -BTRFS_FSID_SIZE ) !=0 && -memcmp (fs_devices->metadata_uuid, disk_super->metadata_uuid, -BTRFS_FSID_SIZE ) ==0 && +if (memcmp_fsid_changed (fs_devices, disk_super->metadata_uuid) &&memcmp (fs_devices->fsid, disk_super->fsid,BTRFS_FSID_SIZE ) !=0 )return fs_devices;
@@ -746,11 +753,10 @@ static struct btrfs_fs_devices *find_fsid_reverted_metadata(* fs_devices equal to the FSID of the disk. */ list_for_each_entry (fs_devices, &fs_uuids, fs_list) { -if (memcmp (fs_devices->fsid, fs_devices->metadata_uuid, -BTRFS_FSID_SIZE ) !=0 && -memcmp (fs_devices->metadata_uuid, disk_super->fsid, -BTRFS_FSID_SIZE ) ==0 && - fs_devices->fsid_change) +if (!fs_devices->fsid_change) +continue ; + +if (memcmp_fsid_changed (fs_devices, disk_super->fsid))return fs_devices; }
Signature · 1 line
2.38.1