]> www.infradead.org Git - users/hch/block.git/commitdiff
cxlflash: query write_zeroes limit for zeroing
authorChristoph Hellwig <hch@lst.de>
Wed, 30 Jan 2019 08:36:57 +0000 (09:36 +0100)
committerChristoph Hellwig <hch@lst.de>
Wed, 9 Feb 2022 08:25:49 +0000 (09:25 +0100)
The write_same and write_zeroes limits for SCSI are effectively the
same, so the current code works just fine.  But we plan to remove
REQ_OP_WRITE_SAME support, so switch to quering the write zeroes
limit for a zeroing WRITE SAME operation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/cxlflash/vlun.c

index 01917b28cdb650da72541677d479042d21a0aaa3..5c74dc7c22889e42395ad13d89ab9be0b9d213b2 100644 (file)
@@ -430,8 +430,8 @@ static int write_same16(struct scsi_device *sdev,
        struct device *dev = &cfg->dev->dev;
        const u32 s = ilog2(sdev->sector_size) - 9;
        const u32 to = sdev->request_queue->rq_timeout;
-       const u32 ws_limit = blk_queue_get_max_sectors(sdev->request_queue,
-                                                      REQ_OP_WRITE_SAME) >> s;
+       const u32 ws_limit =
+               sdev->request_queue->limits.max_write_zeroes_sectors >> s;
 
        cmd_buf = kzalloc(CMD_BUFSIZE, GFP_KERNEL);
        scsi_cmd = kzalloc(MAX_COMMAND_SIZE, GFP_KERNEL);