block: Do away with the notion of hardsect_size

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 0f22e629b13c8e93bf46401c0913605b5d2cbfba..7aa97f65da82e5a46c10c0876f9da7d16c8cbafc 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -146,8 +146,6 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
                struct bio *bio;
 
                bio = bio_alloc(GFP_KERNEL, 0);
-               if (!bio)
-                       return -ENOMEM;
 
                bio->bi_end_io = blk_ioc_discard_endio;
                bio->bi_bdev = bdev;
@@ -313,7 +311,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
        case BLKBSZGET: /* get the logical block size (cf. BLKSSZGET) */
                return put_int(arg, block_size(bdev));
        case BLKSSZGET: /* get block device hardware sector size */
-               return put_int(arg, bdev_hardsect_size(bdev));
+               return put_int(arg, bdev_logical_block_size(bdev));
        case BLKSECTGET:
                return put_ushort(arg, bdev_get_queue(bdev)->max_sectors);
        case BLKRASET: