diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
commit | 6fc2de06ef1e691d032aa572478c905b7495a274 (patch) | |
tree | 778df1440b045d67c997d7bd79ee3c6c11f57638 /drivers/block/brd.c | |
parent | 58c24a61614f5da290068e47fc5ec65370eb61dd (diff) | |
parent | 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (diff) | |
download | lwn-6fc2de06ef1e691d032aa572478c905b7495a274.tar.gz lwn-6fc2de06ef1e691d032aa572478c905b7495a274.zip |
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'drivers/block/brd.c')
-rw-r--r-- | drivers/block/brd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 4f688434daf1..c6ddeacb77fd 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -434,7 +434,7 @@ static struct brd_device *brd_alloc(int i) goto out_free_dev; blk_queue_make_request(brd->brd_queue, brd_make_request); blk_queue_ordered(brd->brd_queue, QUEUE_ORDERED_TAG, NULL); - blk_queue_max_sectors(brd->brd_queue, 1024); + blk_queue_max_hw_sectors(brd->brd_queue, 1024); blk_queue_bounce_limit(brd->brd_queue, BLK_BOUNCE_ANY); disk = brd->brd_disk = alloc_disk(1 << part_shift); |