Commit a773187e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: dm: 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-7-hch@lst.de


Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 10fa225c

drivers/md/dm-core.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ struct mapped_device { 
#define DMF_EMULATE_ZONE_APPEND 9



void disable_discard(struct mapped_device *md);

void disable_write_same(struct mapped_device *md);

void disable_write_zeroes(struct mapped_device *md);



static inline sector_t dm_get_size(struct mapped_device *md)

drivers/md/dm-crypt.c

+0 −1
Original line number Diff line number Diff line
@@ -2006,7 +2006,6 @@ static bool kcryptd_crypt_write_inline(struct crypt_config *cc, 
	 */

	switch (bio_op(ctx->bio_in)) {

	case REQ_OP_WRITE:

	case REQ_OP_WRITE_SAME:

	case REQ_OP_WRITE_ZEROES:

		return true;

	default:

drivers/md/dm-ebs-target.c

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ static int ebs_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	ti->num_flush_bios = 1;

	ti->num_discard_bios = 1;

	ti->num_secure_erase_bios = 0;

	ti->num_write_same_bios = 0;

	ti->num_write_zeroes_bios = 0;

	return 0;

bad:

drivers/md/dm-io.c

+2 −20
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ static void do_region(int op, int op_flags, unsigned region, 
	unsigned num_bvecs;

	sector_t remaining = where->count;

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

	unsigned short logical_block_size = queue_logical_block_size(q);

	sector_t num_sectors;

	unsigned int special_cmd_max_sectors;
@@ -315,10 +314,8 @@ static void do_region(int op, int op_flags, unsigned region, 
		special_cmd_max_sectors = q->limits.max_discard_sectors;

	else if (op == REQ_OP_WRITE_ZEROES)

		special_cmd_max_sectors = q->limits.max_write_zeroes_sectors;

	else if (op == REQ_OP_WRITE_SAME)

		special_cmd_max_sectors = q->limits.max_write_same_sectors;

	if ((op == REQ_OP_DISCARD || op == REQ_OP_WRITE_ZEROES ||

	     op == REQ_OP_WRITE_SAME) && special_cmd_max_sectors == 0) {

	if ((op == REQ_OP_DISCARD || op == REQ_OP_WRITE_ZEROES) &&

	    special_cmd_max_sectors == 0) {

		atomic_inc(&io->count);

		dec_count(io, region, BLK_STS_NOTSUPP);

		return;
@@ -337,9 +334,6 @@ static void do_region(int op, int op_flags, unsigned region, 
		case REQ_OP_WRITE_ZEROES:

			num_bvecs = 0;

			break;

		case REQ_OP_WRITE_SAME:

			num_bvecs = 1;

			break;

		default:

			num_bvecs = bio_max_segs(dm_sector_div_up(remaining,

						(PAGE_SIZE >> SECTOR_SHIFT)));
@@ -356,18 +350,6 @@ static void do_region(int op, int op_flags, unsigned region, 
			num_sectors = min_t(sector_t, special_cmd_max_sectors, remaining);

			bio->bi_iter.bi_size = num_sectors << SECTOR_SHIFT;

			remaining -= num_sectors;

		} else if (op == REQ_OP_WRITE_SAME) {

			/*

			 * WRITE SAME only uses a single page.

			 */

			dp->get_page(dp, &page, &len, &offset);

			bio_add_page(bio, page, logical_block_size, offset);

			num_sectors = min_t(sector_t, special_cmd_max_sectors, remaining);

			bio->bi_iter.bi_size = num_sectors << SECTOR_SHIFT;



			offset = 0;

			remaining -= num_sectors;

			dp->next_page(dp);

		} else while (remaining) {

			/*

			 * Try and add as many pages as possible.

drivers/md/dm-linear.c

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	ti->num_flush_bios = 1;

	ti->num_discard_bios = 1;

	ti->num_secure_erase_bios = 1;

	ti->num_write_same_bios = 1;

	ti->num_write_zeroes_bios = 1;

	ti->private = lc;

	return 0;