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>

diff --git a/block/blk-map.c b/block/blk-map.c
index 0760963546dd271db0ef0411bad1b7ffab923a6f..c07d9c8317f4c055d3821302c22df20cf2627195 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -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;
         */
        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;
        }
 
                rq->extra_len += pad_len;
        }