diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-04 11:31:22 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-03-04 11:31:22 +0100 |
| commit | 56d94a37f63ad1c9da3bc8e903f79d0ee1e80170 (patch) | |
| tree | f5a89d4d6df7b959ca7e1ae3cd8f54a935496cc4 /block | |
| parent | 448da4d262b5db90817ce853726ff4d9b0c2bf48 (diff) | |
| download | kernel_goldelico_gta04-56d94a37f63ad1c9da3bc8e903f79d0ee1e80170.zip kernel_goldelico_gta04-56d94a37f63ad1c9da3bc8e903f79d0ee1e80170.tar.gz kernel_goldelico_gta04-56d94a37f63ad1c9da3bc8e903f79d0ee1e80170.tar.bz2 | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index 0760963..c07d9c8 100644 --- 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; - 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; } |