1 files changed, 12 insertions, 3 deletions

diff --git a/block/blk-lib.c b/block/blk-lib.c
index e16185b0d8e..5d793e143f3 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -41,6 +41,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
         struct request_queue *q = bdev_get_queue(bdev);
         int type = flags & BLKDEV_IFL_BARRIER ?
                 DISCARD_BARRIER : DISCARD_NOBARRIER;
+        unsigned int max_discard_sectors;
         struct bio *bio;
         int ret = 0;
 
@@ -50,10 +51,18 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
         if (!blk_queue_discard(q))
                 return -EOPNOTSUPP;
 
-        while (nr_sects && !ret) {
-                unsigned int max_discard_sectors =
-                        min(q->limits.max_discard_sectors, UINT_MAX >> 9);
+        /*
+         * Ensure that max_discard_sectors is of the proper
+         * granularity
+         */
+        max_discard_sectors = min(q->limits.max_discard_sectors, UINT_MAX >> 9);
+        if (q->limits.discard_granularity) {
+                unsigned int disc_sects = q->limits.discard_granularity >> 9;
 
+                max_discard_sectors &= ~(disc_sects - 1);
+        }
+
+        while (nr_sects && !ret) {
                 bio = bio_alloc(gfp_mask, 1);
                 if (!bio) {
                         ret = -ENOMEM;