[Nbd] [PATCH 4/8] loop: use generic helper to set max_discard_sectors
- To: dwmw2@...1270..., axboe@...161..., shli@...1285..., Paul.Clements@...124..., npiggin@...161..., neilb@...122..., cjb@...1330..., adrian.hunter@...1303...
- Cc: nbd-general@lists.sourceforge.net, Namjae Jeon <linkinjeon@...17...>, Vivek Trivedi <t.vivek@...1329...>, Namjae Jeon <namjae.jeon@...1329...>, linux-mmc@...25..., linux-kernel@...25..., linux-raid@...25..., linux-mtd@...1331...
- Subject: [Nbd] [PATCH 4/8] loop: use generic helper to set max_discard_sectors
- From: Namjae Jeon <linkinjeon@...17...>
- Date: Sat, 13 Apr 2013 22:39:00 +0900
- Message-id: <1365860340-21329-1-git-send-email-linkinjeon@...17...>
From: Namjae Jeon <namjae.jeon@...1329...>
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@...1329...>
Signed-off-by: Vivek Trivedi <t.vivek@...1329...>
---
drivers/block/loop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index b2955b3..21f3233 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -806,7 +806,7 @@ static void loop_config_discard(struct loop_device *lo)
lo->lo_encrypt_key_size) {
q->limits.discard_granularity = 0;
q->limits.discard_alignment = 0;
- q->limits.max_discard_sectors = 0;
+ blk_queue_max_discard_sectors(q, 0);
q->limits.discard_zeroes_data = 0;
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);
return;
@@ -814,7 +814,7 @@ static void loop_config_discard(struct loop_device *lo)
q->limits.discard_granularity = inode->i_sb->s_blocksize;
q->limits.discard_alignment = 0;
- q->limits.max_discard_sectors = UINT_MAX >> 9;
+ blk_queue_max_discard_sectors(q, UINT_MAX >> 9);
q->limits.discard_zeroes_data = 1;
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
}
--
1.7.9.5
Reply to: