diff options
| author |   Martin K. Petersen <martin.petersen@oracle.com> | 2009-05-22 17:17:50 -0400 |
|---|---|---|
| committer |   Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 23:22:54 +0200 |
| commit | ae03bf639a5027d27270123f5f6e3ee6a412781d (patch) | |
| tree | d705f41a188ad656b1f47f7952626a9f992e3b8f /block/ioctl.c | |
| parent | block: Do away with the notion of hardsect_size (diff) | |
| download | linux-dev-ae03bf639a5027d27270123f5f6e3ee6a412781d.tar.xz linux-dev-ae03bf639a5027d27270123f5f6e3ee6a412781d.zip | |
block: Use accessor functions for queue limits
Convert all external users of queue limits to using wrapper functions
instead of poking the request queue variables directly.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/ioctl.c')
| -rw-r--r-- | block/ioctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 7aa97f65da82..500e4c73cc52 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -152,10 +152,10 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start, bio->bi_private = &wait; bio->bi_sector = start; - if (len > q->max_hw_sectors) { - bio->bi_size = q->max_hw_sectors << 9; - len -= q->max_hw_sectors; - start += q->max_hw_sectors; + if (len > queue_max_hw_sectors(q)) { + bio->bi_size = queue_max_hw_sectors(q) << 9; + len -= queue_max_hw_sectors(q); + start += queue_max_hw_sectors(q); } else { bio->bi_size = len << 9; len = 0; @@ -313,7 +313,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, case BLKSSZGET: /* get block device hardware sector size */ return put_int(arg, bdev_logical_block_size(bdev)); case BLKSECTGET: - return put_ushort(arg, bdev_get_queue(bdev)->max_sectors); + return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev))); case BLKRASET: case BLKFRASET: if(!capable(CAP_SYS_ADMIN)) |