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

sd: simplify the disable case in sd_config_discard 



Fall through to the main call to blk_queue_max_discard_sectors given that
max_blocks has been initialized to zero above instead of duplicating the
call.

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-9-hch@lst.de


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

drivers/scsi/sd.c

+1 −2
Original line number Diff line number Diff line
@@ -844,8 +844,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode) 


	case SD_LBP_FULL:

	case SD_LBP_DISABLE:

		blk_queue_max_discard_sectors(q, 0);

		return;

		break;



	case SD_LBP_UNMAP:

		max_blocks = min_not_zero(sdkp->max_unmap_blocks,