Skip to content

Commit

Permalink
block: fix shadowed variable warning in blk-map.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
hharrison authored and Jens Axboe committed Mar 4, 2008
1 parent 448da4d commit 56d94a3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions block/blk-map.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 56d94a3

Please sign in to comment.