From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Tue, 4 Mar 2008 10:31:22 +0000 (+0100)
Subject: block: fix shadowed variable warning in blk-map.c
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=56d94a37f63ad1c9da3bc8e903f79d0ee1e80170;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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 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,
 	 */
 	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;
 	}