Commit 176df894 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Song Liu
Browse files

md: add a mddev_is_dm helper 



Add a helper to check for a DM-mapped MD device instead of using
the obfuscated ->gendisk or ->queue NULL checks.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed--by: default avatarSong Liu <song@kernel.org>
Tested-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240303140150.5435-4-hch@lst.de
parent 28be4fd3

drivers/md/md.c

+7 −8
Original line number Diff line number Diff line
@@ -2410,7 +2410,7 @@ int md_integrity_register(struct mddev *mddev) 


	if (list_empty(&mddev->disks))

		return 0; /* nothing to do */

	if (!mddev->gendisk || blk_get_integrity(mddev->gendisk))

	if (mddev_is_dm(mddev) || blk_get_integrity(mddev->gendisk))

		return 0; /* shouldn't register, or already is */

	rdev_for_each(rdev, mddev) {

		/* skip spares and non-functional disks */
@@ -2463,7 +2463,7 @@ int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev) 
{

	struct blk_integrity *bi_mddev;



	if (!mddev->gendisk)

	if (mddev_is_dm(mddev))

		return 0;



	bi_mddev = blk_get_integrity(mddev->gendisk);
@@ -5977,7 +5977,7 @@ int md_run(struct mddev *mddev) 
		invalidate_bdev(rdev->bdev);

		if (mddev->ro != MD_RDONLY && rdev_read_only(rdev)) {

			mddev->ro = MD_RDONLY;

			if (mddev->gendisk)

			if (!mddev_is_dm(mddev))

				set_disk_ro(mddev->gendisk, 1);

		}
@@ -6139,7 +6139,7 @@ int md_run(struct mddev *mddev) 
		}

	}



	if (mddev->queue) {

	if (!mddev_is_dm(mddev)) {

		bool nonrot = true;



		rdev_for_each(rdev, mddev) {
@@ -6404,7 +6404,7 @@ static void mddev_detach(struct mddev *mddev) 
		mddev->pers->quiesce(mddev, 0);

	}

	md_unregister_thread(mddev, &mddev->thread);

	if (mddev->queue)

	if (!mddev_is_dm(mddev))

		blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/

}
@@ -7360,11 +7360,10 @@ static int update_size(struct mddev *mddev, sector_t num_sectors) 
	if (!rv) {

		if (mddev_is_clustered(mddev))

			md_cluster_ops->update_size(mddev, old_dev_sectors);

		else if (mddev->queue) {

		else if (!mddev_is_dm(mddev))

			set_capacity_and_notify(mddev->gendisk,

						mddev->array_sectors);

	}

	}

	return rv;

}
@@ -9177,7 +9176,7 @@ void md_do_sync(struct md_thread *thread) 
			mddev->delta_disks > 0 &&

			mddev->pers->finish_reshape &&

			mddev->pers->size &&

			mddev->queue) {

			!mddev_is_dm(mddev)) {

		mddev_lock_nointr(mddev);

		md_set_array_sectors(mddev, mddev->pers->size(mddev, 0, 0));

		mddev_unlock(mddev);

drivers/md/md.h

+10 −2
Original line number Diff line number Diff line
@@ -911,16 +911,24 @@ int do_md_run(struct mddev *mddev); 


extern const struct block_device_operations md_fops;



/*

 * MD devices can be used undeneath by DM, in which case ->gendisk is NULL.

 */

static inline bool mddev_is_dm(struct mddev *mddev)

{

	return !mddev->gendisk;

}



static inline void mddev_trace_remap(struct mddev *mddev, struct bio *bio,

		sector_t sector)

{

	if (mddev->gendisk)

	if (!mddev_is_dm(mddev))

		trace_block_bio_remap(bio, disk_devt(mddev->gendisk), sector);

}



#define mddev_add_trace_msg(mddev, fmt, args...)			\

do {									\

	if ((mddev)->gendisk)						\

	if (!mddev_is_dm(mddev))					\

		blk_add_trace_msg((mddev)->queue, fmt, ##args);		\

} while (0)

drivers/md/raid0.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int raid0_run(struct mddev *mddev) 
		mddev->private = conf;

	}

	conf = mddev->private;

	if (mddev->queue) {

	if (!mddev_is_dm(mddev)) {

		struct md_rdev *rdev;



		blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors);

drivers/md/raid1.c

+5 −8
Original line number Diff line number Diff line
@@ -1926,7 +1926,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
	for (mirror = first; mirror <= last; mirror++) {

		p = conf->mirrors + mirror;

		if (!p->rdev) {

			if (mddev->gendisk)

			if (!mddev_is_dm(mddev))

				disk_stack_limits(mddev->gendisk, rdev->bdev,

						  rdev->data_offset << 9);
@@ -3227,12 +3227,9 @@ static int raid1_run(struct mddev *mddev) 
	if (IS_ERR(conf))

		return PTR_ERR(conf);



	if (mddev->queue)

	if (!mddev_is_dm(mddev)) {

		blk_queue_max_write_zeroes_sectors(mddev->queue, 0);



	rdev_for_each(rdev, mddev) {

		if (!mddev->gendisk)

			continue;

		rdev_for_each(rdev, mddev)

			disk_stack_limits(mddev->gendisk, rdev->bdev,

					  rdev->data_offset << 9);

	}

drivers/md/raid10.c

+5 −5
Original line number Diff line number Diff line
@@ -2106,7 +2106,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
			continue;

		}



		if (mddev->gendisk)

		if (!mddev_is_dm(mddev))

			disk_stack_limits(mddev->gendisk, rdev->bdev,

					  rdev->data_offset << 9);
@@ -2126,7 +2126,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
		set_bit(Replacement, &rdev->flags);

		rdev->raid_disk = repl_slot;

		err = 0;

		if (mddev->gendisk)

		if (!mddev_is_dm(mddev))

			disk_stack_limits(mddev->gendisk, rdev->bdev,

					  rdev->data_offset << 9);

		conf->fullsync = 1;
@@ -4014,7 +4014,7 @@ static int raid10_run(struct mddev *mddev) 
		}

	}



	if (mddev->queue) {

	if (!mddev_is_dm(conf->mddev)) {

		blk_queue_max_write_zeroes_sectors(mddev->queue, 0);

		blk_queue_io_min(mddev->queue, mddev->chunk_sectors << 9);

		raid10_set_io_opt(conf);
@@ -4048,7 +4048,7 @@ static int raid10_run(struct mddev *mddev) 
		if (first || diff < min_offset_diff)

			min_offset_diff = diff;



		if (mddev->gendisk)

		if (!mddev_is_dm(mddev))

			disk_stack_limits(mddev->gendisk, rdev->bdev,

					  rdev->data_offset << 9);
@@ -4933,7 +4933,7 @@ static void end_reshape(struct r10conf *conf) 
	conf->reshape_safe = MaxSector;

	spin_unlock_irq(&conf->device_lock);



	if (conf->mddev->queue)

	if (!mddev_is_dm(conf->mddev))

		raid10_set_io_opt(conf);

	conf->fullsync = 0;

}