mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 13:53:33 +00:00
Code Issues Releases Wiki Activity

block: simplify partition_overlaps

Browse source 
Just use xa_for_each to iterate over the partitions as there is no need
to grab a reference to each partition.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210406062303.811835-8-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-04-06 08:22:58 +02:00 committed by Jens Axboe
parent 6c4541a8bb
commit e30691237b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
block/partitions/core.c
View file

@ -420,21 +420,21 @@ static struct block_device *add_partition(struct gendisk *disk, int partno,
static bool partition_overlaps(struct gendisk *disk, sector_t start, static bool partition_overlaps(struct gendisk *disk, sector_t start,
sector_t length, int skip_partno) sector_t length, int skip_partno)
{ {
struct disk_part_iter piter;
struct block_device *part; struct block_device *part;
bool overlap = false; bool overlap = false;
unsigned long idx;
disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); rcu_read_lock();
while ((part = disk_part_iter_next(&piter))) { xa_for_each_start(&disk->part_tbl, idx, part, 1) {
if (part->bd_partno == skip_partno || if (part->bd_partno != skip_partno &&
start >= part->bd_start_sect + bdev_nr_sectors(part) || start < part->bd_start_sect + bdev_nr_sectors(part) &&
start + length <= part->bd_start_sect) start + length > part->bd_start_sect) {
continue; overlap = true;
overlap = true; break;
break; }
} }
rcu_read_unlock();
disk_part_iter_exit(&piter);
return overlap; return overlap;
} }