OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
66ac028
)
gcc-4.6: block: fix unused but set variables in blk-merge
author
Andi Kleen
<andi@firstfloor.org>
Mon, 21 Jun 2010 09:02:47 +0000
(11:02 +0200)
committer
Jens Axboe
<jaxboe@fusionio.com>
Sat, 7 Aug 2010 16:23:10 +0000
(18:23 +0200)
Just some dead code.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
block/blk-merge.c
patch
|
blob
|
history
diff --git
a/block/blk-merge.c
b/block/blk-merge.c
index
4852475
..
3b0cd42
100644
(file)
--- a/
block/blk-merge.c
+++ b/
block/blk-merge.c
@@
-12,7
+12,6
@@
static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
struct bio *bio)
{
- unsigned int phys_size;
struct bio_vec *bv, *bvprv = NULL;
int cluster, i, high, highprv = 1;
unsigned int seg_size, nr_phys_segs;
@@
-24,7
+23,7
@@
static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
fbio = bio;
cluster = test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
seg_size = 0;
-
phys_size =
nr_phys_segs = 0;
+ nr_phys_segs = 0;
for_each_bio(bio) {
bio_for_each_segment(bv, bio, i) {
/*