block: fix shadowed variable warning in blk-map.c
Introduced between 2.6.25-rc2 and -rc3 block/blk-map.c:154:14: warning: symbol 'bio' shadows an earlier one block/blk-map.c:110:13: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
448da4d262
commit
56d94a37f6
1 changed files with 3 additions and 3 deletions
|
@ -152,10 +152,10 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
|
|||
*/
|
||||
if (len & q->dma_pad_mask) {
|
||||
unsigned int pad_len = (q->dma_pad_mask & ~len) + 1;
|
||||
struct bio *bio = rq->biotail;
|
||||
struct bio *tail = rq->biotail;
|
||||
|
||||
bio->bi_io_vec[bio->bi_vcnt - 1].bv_len += pad_len;
|
||||
bio->bi_size += pad_len;
|
||||
tail->bi_io_vec[tail->bi_vcnt - 1].bv_len += pad_len;
|
||||
tail->bi_size += pad_len;
|
||||
|
||||
rq->extra_len += pad_len;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue