[Nbd] [PATCH v2 3/9] sd: 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..., James.Bottomley@...1336..., JBottomley@...1298...
- Cc: nbd-general@lists.sourceforge.net, Namjae Jeon <linkinjeon@...17...>, Vivek Trivedi <t.vivek@...1329...>, linux-scsi@...25..., Namjae Jeon <namjae.jeon@...1329...>, linux-mmc@...25..., linux-kernel@...25..., linux-raid@...25..., jcmvbkbc@...17..., linux-mtd@...1331...
- Subject: [Nbd] [PATCH v2 3/9] sd: use generic helper to set max_discard_sectors
- From: Namjae Jeon <linkinjeon@...17...>
- Date: Sat, 20 Apr 2013 01:41:00 +0900
- Message-id: <1366389660-19417-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/scsi/sd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 7992635..93c26b3 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -632,7 +632,8 @@ 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);
}
--
1.7.9.5
Reply to: