diff options
| author |   Jens Axboe <jens.axboe@oracle.com> | 2006-12-19 08:27:31 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2006-12-19 08:27:31 +0100 |
| commit | 2985259b0e3928d4cd0723ac5aad0d1190ab7717 (patch) | |
| tree | 70d1d7801699102d3bb52bc84b8ec8f4fc371c06 /block/ll_rw_blk.c | |
| parent | [PATCH] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request (diff) | |
| download | linux-dev-2985259b0e3928d4cd0723ac5aad0d1190ab7717.tar.xz linux-dev-2985259b0e3928d4cd0723ac5aad0d1190ab7717.zip | |
[PATCH] ->nr_sectors and ->hard_nr_sectors are not used for BLOCK_PC requests
It's a file system thing, for block requests the only size used in the
io paths is ->data_len as it is in bytes, not sectors.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/ll_rw_blk.c')
| -rw-r--r-- | block/ll_rw_blk.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 79807dbc306e..71a78a7e42fd 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -2350,12 +2350,12 @@ static int __blk_rq_map_user(request_queue_t *q, struct request *rq, else bio = bio_copy_user(q, uaddr, len, reading); - if (IS_ERR(bio)) { + if (IS_ERR(bio)) return PTR_ERR(bio); - } orig_bio = bio; blk_queue_bounce(q, &bio); + /* * We link the bounce buffer in and could have to traverse it * later so we have to get a ref to prevent it from being freed @@ -2379,8 +2379,6 @@ static int __blk_rq_map_user(request_queue_t *q, struct request *rq, rq->biotail->bi_next = bio; rq->biotail = bio; - rq->nr_sectors += bio_sectors(bio); - rq->hard_nr_sectors = rq->nr_sectors; rq->data_len += bio->bi_size; } spin_unlock_irq(q->queue_lock); |