aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorHarvey Harrison2008-03-04 04:31:22 -0600
committerJens Axboe2008-03-04 04:31:22 -0600
commit56d94a37f63ad1c9da3bc8e903f79d0ee1e80170 (patch)
treef5a89d4d6df7b959ca7e1ae3cd8f54a935496cc4 /block
parent448da4d262b5db90817ce853726ff4d9b0c2bf48 (diff)
downloadkernel-common-56d94a37f63ad1c9da3bc8e903f79d0ee1e80170.tar.gz
kernel-common-56d94a37f63ad1c9da3bc8e903f79d0ee1e80170.tar.xz
kernel-common-56d94a37f63ad1c9da3bc8e903f79d0ee1e80170.zip
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-map.c b/block/blk-map.c
index 0760963546d..c07d9c8317f 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,
152 */ 152 */
153 if (len & q->dma_pad_mask) { 153 if (len & q->dma_pad_mask) {
154 unsigned int pad_len = (q->dma_pad_mask & ~len) + 1; 154 unsigned int pad_len = (q->dma_pad_mask & ~len) + 1;
155 struct bio *bio = rq->biotail; 155 struct bio *tail = rq->biotail;
156 156
157 bio->bi_io_vec[bio->bi_vcnt - 1].bv_len += pad_len; 157 tail->bi_io_vec[tail->bi_vcnt - 1].bv_len += pad_len;
158 bio->bi_size += pad_len; 158 tail->bi_size += pad_len;
159 159
160 rq->extra_len += pad_len; 160 rq->extra_len += pad_len;
161 } 161 }