Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c04fa44b authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Jens Axboe
Browse files

block: always set partition number to '0' in blk_partition_remap() 



blk_partition_remap() will only clear bi_partno if an actual remapping
has happened. But flush request et al don't have an actual size, so
the remapping doesn't happen and bi_partno is never cleared.
So for stacked devices blk_partition_remap() will be called on each level.
If (as is the case for native nvme multipathing) one of the lower-level
devices do _not_support partitioning a spurious I/O error is generated.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 84fca1b0

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2220,10 +2220,10 @@ static inline int blk_partition_remap(struct bio *bio) 
		if (bio_check_eod(bio, part_nr_sects_read(p)))

			goto out;

		bio->bi_iter.bi_sector += p->start_sect;

		bio->bi_partno = 0;

		trace_block_bio_remap(bio->bi_disk->queue, bio, part_devt(p),

				      bio->bi_iter.bi_sector - p->start_sect);

	}

	bio->bi_partno = 0;

	ret = 0;

out:

	rcu_read_unlock();