Commit 9972b8ce authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

sd: add a sd_disable_write_same helper

Add helper to disable WRITE SAME when it is not supported and use it
instead of sd_config_write_same in the I/O completion handler.  This
avoids touching more fields than required in the I/O completion handler
and  prepares for converting sd to use the atomic queue limits API.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240531074837.1648501-8-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b0dadb86
...@@ -1004,6 +1004,13 @@ static blk_status_t sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd) ...@@ -1004,6 +1004,13 @@ static blk_status_t sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd)
return sd_setup_write_same10_cmnd(cmd, false); return sd_setup_write_same10_cmnd(cmd, false);
} }
static void sd_disable_write_same(struct scsi_disk *sdkp)
{
sdkp->device->no_write_same = 1;
sdkp->max_ws_blocks = 0;
blk_queue_max_write_zeroes_sectors(sdkp->disk->queue, 0);
}
static void sd_config_write_same(struct scsi_disk *sdkp) static void sd_config_write_same(struct scsi_disk *sdkp)
{ {
struct request_queue *q = sdkp->disk->queue; struct request_queue *q = sdkp->disk->queue;
...@@ -2258,8 +2265,7 @@ static int sd_done(struct scsi_cmnd *SCpnt) ...@@ -2258,8 +2265,7 @@ static int sd_done(struct scsi_cmnd *SCpnt)
if (SCpnt->cmnd[1] & 8) { /* UNMAP */ if (SCpnt->cmnd[1] & 8) { /* UNMAP */
sd_disable_discard(sdkp); sd_disable_discard(sdkp);
} else { } else {
sdkp->device->no_write_same = 1; sd_disable_write_same(sdkp);
sd_config_write_same(sdkp);
req->rq_flags |= RQF_QUIET; req->rq_flags |= RQF_QUIET;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment