powerpc: Full barrier for smp_mb__after_unlock_lock()

[platform/adaptation/renesas_rcar/renesas_kernel.git] / block / blk-lib.c

diff --git a/block/blk-lib.c b/block/blk-lib.c
index d6f50d5..9b5b561 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -43,8 +43,8 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
        DECLARE_COMPLETION_ONSTACK(wait);
        struct request_queue *q = bdev_get_queue(bdev);
        int type = REQ_WRITE | REQ_DISCARD;
-       sector_t max_discard_sectors;
-       sector_t granularity, alignment;
+       unsigned int max_discard_sectors, granularity;
+       int alignment;
        struct bio_batch bb;
        struct bio *bio;
        int ret = 0;
@@ -58,16 +58,14 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 
        /* Zero-sector (unknown) and one-sector granularities are the same.  */
        granularity = max(q->limits.discard_granularity >> 9, 1U);
-       alignment = bdev_discard_alignment(bdev) >> 9;
-       alignment = sector_div(alignment, granularity);
+       alignment = (bdev_discard_alignment(bdev) >> 9) % granularity;
 
        /*
         * Ensure that max_discard_sectors is of the proper
         * granularity, so that requests stay aligned after a split.
         */
        max_discard_sectors = min(q->limits.max_discard_sectors, UINT_MAX >> 9);
-       sector_div(max_discard_sectors, granularity);
-       max_discard_sectors *= granularity;
+       max_discard_sectors -= max_discard_sectors % granularity;
        if (unlikely(!max_discard_sectors)) {
                /* Avoid infinite loop below. Being cautious never hurts. */
                return -EOPNOTSUPP;