Commit 10fa225c authored Feb 09, 2022 by Christoph Hellwig Committed by Martin K. Petersen Feb 22, 2022

scsi: md: Remove WRITE_SAME support

There are no more end-users of REQ_OP_WRITE_SAME left, so we can start
deleting it.

Link: https://lore.kernel.org/r/20220209082828.2629273-6-hch@lst.de


Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent e383e16e

drivers/md/md-linear.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,6 @@ static bool linear_make_request(struct mddev mddev, struct bio bio)
		if (mddev->gendisk)
		trace_block_bio_remap(bio, disk_devt(mddev->gendisk),
		bio_sector);
		mddev_check_writesame(mddev, bio);
		mddev_check_write_zeroes(mddev, bio);
		submit_bio_noacct(bio);
		}

drivers/md/md-multipath.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,6 @@ static bool multipath_make_request(struct mddev mddev, struct bio bio)
		mp_bh->bio.bi_opf \|= REQ_FAILFAST_TRANSPORT;
		mp_bh->bio.bi_end_io = multipath_end_request;
		mp_bh->bio.bi_private = mp_bh;
		mddev_check_writesame(mddev, &mp_bh->bio);
		mddev_check_write_zeroes(mddev, &mp_bh->bio);
		submit_bio_noacct(&mp_bh->bio);
		return true;

drivers/md/md.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -797,13 +797,6 @@ static inline void mddev_clear_unsupported_flags(struct mddev *mddev,
		mddev->flags &= ~unsupported_flags;
		}

		static inline void mddev_check_writesame(struct mddev mddev, struct bio bio)
		{
		if (bio_op(bio) == REQ_OP_WRITE_SAME &&
		!bio->bi_bdev->bd_disk->queue->limits.max_write_same_sectors)
		mddev->queue->limits.max_write_same_sectors = 0;
		}

		static inline void mddev_check_write_zeroes(struct mddev mddev, struct bio bio)
		{
		if (bio_op(bio) == REQ_OP_WRITE_ZEROES &&

drivers/md/raid0.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -402,7 +402,6 @@ static int raid0_run(struct mddev *mddev)
		bool discard_supported = false;

		blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors);
		blk_queue_max_write_same_sectors(mddev->queue, mddev->chunk_sectors);
		blk_queue_max_write_zeroes_sectors(mddev->queue, mddev->chunk_sectors);
		blk_queue_max_discard_sectors(mddev->queue, UINT_MAX);

		@@ -594,7 +593,6 @@ static bool raid0_make_request(struct mddev mddev, struct bio bio)
		if (mddev->gendisk)
		trace_block_bio_remap(bio, disk_devt(mddev->gendisk),
		bio_sector);
		mddev_check_writesame(mddev, bio);
		mddev_check_write_zeroes(mddev, bio);
		submit_bio_noacct(bio);
		return true;

drivers/md/raid1.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -3147,10 +3147,8 @@ static int raid1_run(struct mddev *mddev)
		if (IS_ERR(conf))
		return PTR_ERR(conf);

		if (mddev->queue) {
		blk_queue_max_write_same_sectors(mddev->queue, 0);
		if (mddev->queue)
		blk_queue_max_write_zeroes_sectors(mddev->queue, 0);
		}

		rdev_for_each(rdev, mddev) {
		if (!mddev->gendisk)