perf tools: Pass build_id object to dso__build_id_equal()

[linux-2.6-microblaze.git] / block / blk-lib.c

diff --git a/block/blk-lib.c b/block/blk-lib.c
index 019e09b..0d1811e 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -47,6 +47,15 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                op = REQ_OP_DISCARD;
        }
 
+       /* In case the discard granularity isn't set by buggy device driver */
+       if (WARN_ON_ONCE(!q->limits.discard_granularity)) {
+               char dev_name[BDEVNAME_SIZE];
+
+               bdevname(bdev, dev_name);
+               pr_err_ratelimited("%s: Error: discard_granularity is 0.\n", dev_name);
+               return -EOPNOTSUPP;
+       }
+
        bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
        if ((sector | nr_sects) & bs_mask)
                return -EINVAL;