kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

libutil/util_part: return partition containing given block range

Browse Source 
Return the partition number which contains the given block range,
before it was tested for exact match between a partition block range
and the one provided by user. The old behavior with exact match
should still work, this change just relaxes the partition matching
algorithm and allows one to find a partition which contains the given
block range.

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Alexander Egorenkov
2022-06-01 11:02:05 +02:00
committed by Jan Höppner
parent a66f6bb075
commit 60f862b21c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libutil/util_part.c
View File

@@ -128,7 +128,7 @@ static int mbr_table_ext_search(int fh, size_t blk_start_mbr,
start = blk_start_mbr + le32toh(mbr.part_entry_vec[0].blk_start);
cnt = le32toh(mbr.part_entry_vec[0].blk_cnt);
if ((start == blk_start) && (cnt == blk_cnt))
if ((start <= blk_start) && (cnt >= (blk_start - start) + blk_cnt))
return part_num;
/* Second entry contains relative offset for next logical volume */
@@ -162,11 +162,11 @@ static int mbr_table_search(int fh, struct mbr *mbr, size_t blk_start,
* The kernel sets count for extended partitions explicitly.
* Therefore we do not check count here.
*/
if (mbr_part_is_ext(type) && (start == blk_start)) {
if (mbr_part_is_ext(type) && (start <= blk_start)) {
*part_ext = 1;
return part_num;
}
if ((start == blk_start) && (cnt == blk_cnt))
if ((start <= blk_start) && (cnt >= (blk_start - start) + blk_cnt))
return part_num;
if (!mbr_part_is_ext(type))
continue;
@@ -207,7 +207,7 @@ static int gpt_table_search(int fh, struct gpt *gpt, size_t blk_start,
end = le64toh(part_entry->blk_end);
if (start == 0) /* Empty slot */
continue;
if ((start == blk_start) && (end == blk_end))
if ((start <= blk_start) && (end >= blk_end))
return part_num;
}
return 0;