Commit 10f0d2a5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: add a bdev_nonrot helper 



Add a helper to check the nonrot flag based on the block_device instead
of having to poke into the block layer internal request_queue.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Acked-by: David Sterba <dsterba@suse.com> [btrfs]
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220415045258.199825-12-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9964e674

block/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode, 
				    queue_max_sectors(bdev_get_queue(bdev)));

		return put_ushort(argp, max_sectors);

	case BLKROTATIONAL:

		return put_ushort(argp, !blk_queue_nonrot(bdev_get_queue(bdev)));

		return put_ushort(argp, !bdev_nonrot(bdev));

	case BLKRASET:

	case BLKFRASET:

		if(!capable(CAP_SYS_ADMIN))

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ static void loop_update_rotational(struct loop_device *lo) 


	/* not all filesystems (e.g. tmpfs) have a sb->s_bdev */

	if (file_bdev)

		nonrot = blk_queue_nonrot(bdev_get_queue(file_bdev));

		nonrot = bdev_nonrot(file_bdev);



	if (nonrot)

		blk_queue_flag_set(QUEUE_FLAG_NONROT, q);

drivers/md/dm-table.c

+1 −3
Original line number Diff line number Diff line
@@ -1820,9 +1820,7 @@ static int device_dax_write_cache_enabled(struct dm_target *ti, 
static int device_is_rotational(struct dm_target *ti, struct dm_dev *dev,

				sector_t start, sector_t len, void *data)

{

	struct request_queue *q = bdev_get_queue(dev->bdev);



	return !blk_queue_nonrot(q);

	return !bdev_nonrot(dev->bdev);

}



static int device_is_not_random(struct dm_target *ti, struct dm_dev *dev,

drivers/md/md.c

+1 −2
Original line number Diff line number Diff line
@@ -5991,8 +5991,7 @@ int md_run(struct mddev *mddev) 
		bool nonrot = true;



		rdev_for_each(rdev, mddev) {

			if (rdev->raid_disk >= 0 &&

			    !blk_queue_nonrot(bdev_get_queue(rdev->bdev))) {

			if (rdev->raid_disk >= 0 && !bdev_nonrot(rdev->bdev)) {

				nonrot = false;

				break;

			}

drivers/md/raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect 
			/* At least two disks to choose from so failfast is OK */

			set_bit(R1BIO_FailFast, &r1_bio->state);



		nonrot = blk_queue_nonrot(bdev_get_queue(rdev->bdev));

		nonrot = bdev_nonrot(rdev->bdev);

		has_nonrot_disk |= nonrot;

		pending = atomic_read(&rdev->nr_pending);

		dist = abs(this_sector - conf->mirrors[disk].head_position);