diff options
| author | Jens Axboe <axboe@fb.com> | 2015-07-14 17:15:12 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-07-17 17:41:53 +0300 |
| commit | 2bb4cd5cc472b191a46938becb7dafdd44644329 (patch) | |
| tree | 8fabaacb2c5aebf2cc7b18dc59898a234985dbbd /drivers/scsi/sd.c | |
| parent | 6c71013ecb7e2bddbed9f5b95e7aed22c491daa9 (diff) | |
| download | linux-2bb4cd5cc472b191a46938becb7dafdd44644329.tar.xz | |
block: have drivers use blk_queue_max_discard_sectors()
Some drivers use it now, others just set the limits field manually.
But in preparation for splitting this into a hard and soft limit,
ensure that they all call the proper function for setting the hw
limit for discards.
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 3b2fcb4fada0..160e44e7b24a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -647,7 +647,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode) switch (mode) { case SD_LBP_DISABLE: - q->limits.max_discard_sectors = 0; + blk_queue_max_discard_sectors(q, 0); queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q); return; @@ -675,7 +675,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode) break; } - q->limits.max_discard_sectors = max_blocks * (logical_block_size >> 9); + blk_queue_max_discard_sectors(q, max_blocks * (logical_block_size >> 9)); queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); } |