diff options
| author | Alan <gnomes@lxorguk.ukuu.org.uk> | 2016-02-17 15:15:30 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-02-17 18:20:42 +0100 |
| commit | 18f922d037211a15543af935861bf92161e697e9 (patch) | |
| tree | 99fe77119a941ad307706095915b99bb3325fadb /block/blk-sysfs.c | |
| parent | writeback: initialize inode members that track writeback history (diff) | |
| download | linux-18f922d037211a15543af935861bf92161e697e9.tar.xz linux-18f922d037211a15543af935861bf92161e697e9.zip | |
blk: fix overflow in queue_discard_max_hw_show
We get this right for queue_discard_max_show but not max_hw_show. Follow the
same pattern as queue_discard_max_show instead so that we don't truncate.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to '')
| -rw-r--r-- | block/blk-sysfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index e140cc487ce1..dd93763057ce 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -147,10 +147,9 @@ static ssize_t queue_discard_granularity_show(struct request_queue *q, char *pag static ssize_t queue_discard_max_hw_show(struct request_queue *q, char *page) { - unsigned long long val; - val = q->limits.max_hw_discard_sectors << 9; - return sprintf(page, "%llu\n", val); + return sprintf(page, "%llu\n", + (unsigned long long)q->limits.max_hw_discard_sectors << 9); } static ssize_t queue_discard_max_show(struct request_queue *q, char *page) |