From: Harvey Harrison 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 Cc: Jens Axboe Signed-off-by: Andrew Morton --- block/blk-map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN block/blk-map.c~block-fix-shadowed-variable-warning-in-blk-mapc block/blk-map.c --- a/block/blk-map.c~block-fix-shadowed-variable-warning-in-blk-mapc +++ a/block/blk-map.c @@ -151,10 +151,10 @@ int blk_rq_map_user(struct request_queue */ if (len & queue_dma_alignment(q)) { unsigned int pad_len = (queue_dma_alignment(q) & ~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->data_len += pad_len; } _