Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree...

[firefly-linux-kernel-4.4.55.git] / block / blk-lib.c

diff --git a/block/blk-lib.c b/block/blk-lib.c
index 78e627e2581d5a6c80ec12d9267c57c0468ecf5f..2b461b496a788c11d00616efaf16df121e620160 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -59,7 +59,10 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
         * granularity
         */
        max_discard_sectors = min(q->limits.max_discard_sectors, UINT_MAX >> 9);
-       if (q->limits.discard_granularity) {
+       if (unlikely(!max_discard_sectors)) {
+               /* Avoid infinite loop below. Being cautious never hurts. */
+               return -EOPNOTSUPP;
+       } else if (q->limits.discard_granularity) {
                unsigned int disc_sects = q->limits.discard_granularity >> 9;
 
                max_discard_sectors &= ~(disc_sects - 1);