block: restore the meaning of rq->data_len to the true data length

[safe/jmp/linux-2.6] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 2d7e3a2..a248cf1 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -127,7 +127,6 @@ void rq_init(struct request_queue *q, struct request *rq)
        rq->nr_hw_segments = 0;
        rq->ioprio = 0;
        rq->special = NULL;
-       rq->raw_data_len = 0;
        rq->buffer = NULL;
        rq->tag = -1;
        rq->errors = 0;
@@ -135,6 +134,7 @@ void rq_init(struct request_queue *q, struct request *rq)
        rq->cmd_len = 0;
        memset(rq->cmd, 0, sizeof(rq->cmd));
        rq->data_len = 0;
+       rq->extra_len = 0;
        rq->sense_len = 0;
        rq->data = NULL;
        rq->sense = NULL;
@@ -2018,7 +2018,6 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
        rq->hard_cur_sectors = rq->current_nr_sectors;
        rq->hard_nr_sectors = rq->nr_sectors = bio_sectors(bio);
        rq->buffer = bio_data(bio);
-       rq->raw_data_len = bio->bi_size;
        rq->data_len = bio->bi_size;
 
        rq->bio = rq->biotail = bio;