From: Christoph Hellwig <hch@lst.de>
Date: Fri, 31 May 2024 07:48:03 +0000 (+0200)
Subject: sd: simplify the disable case in sd_config_discard
X-Git-Tag: v6.11-rc1~80^2~80^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d15b9bd42cd3b2077812d4bf32f532a9bd5c4914;p=thirdparty%2Fkernel%2Flinux.git

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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240531074837.1648501-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 70211d0b18765..0dbc6eb7a7cac 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -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,