Messages in this thread Patch in this message | | | From | Namjae Jeon <> | Subject | [PATCH v2 6/9] nbd: use generic helper to set max_discard_sectors | Date | Sat, 20 Apr 2013 01:41:53 +0900 |
| |
From: Namjae Jeon <namjae.jeon@samsung.com>
It is better to use blk_queue_max_discard_sectors helper function to set max_discard_sectors as it checks max_discard_sectors upper limit UINT_MAX >> 9
similar issue was reported for mmc in below link https://lkml.org/lkml/2013/4/1/292
If multiple discard requests get merged, merged discard request's size exceeds 4GB, there is possibility that merged discard request's __data_len field may overflow.
This patch fixes this issue.
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Vivek Trivedi <t.vivek@samsung.com> --- drivers/block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 037288e..b9d3d2e 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -854,7 +854,7 @@ static int __init nbd_init(void) */ queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue); disk->queue->limits.discard_granularity = 512; - disk->queue->limits.max_discard_sectors = UINT_MAX; + blk_queue_max_discard_sectors(disk->queue, UINT_MAX >> 9); disk->queue->limits.discard_zeroes_data = 0; blk_queue_max_hw_sectors(disk->queue, 65536); disk->queue->limits.max_sectors = 256; -- 1.7.9.5
| |