Skip to content

Commit d15b9bd

Browse files
Christoph Hellwigaxboe
authored andcommitted
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 <[email protected]> Reviewed-by: Bart Van Assche <[email protected]> Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Martin K. Petersen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 9972b8c commit d15b9bd

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/scsi/sd.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode)
844844

845845
case SD_LBP_FULL:
846846
case SD_LBP_DISABLE:
847-
blk_queue_max_discard_sectors(q, 0);
848-
return;
847+
break;
849848

850849
case SD_LBP_UNMAP:
851850
max_blocks = min_not_zero(sdkp->max_unmap_blocks,

0 commit comments

Comments
 (0)