Merge commit 'v2.6.30-rc6' into tracing/core

Merge reason: we were on an -rc4 base, sync up to -rc6

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index d028baf946a3..1306de9cce04 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1767,10 +1767,10 @@ static int __end_that_request_first(struct request *req, int error,
                 } else {
                         int idx = bio->bi_idx + next_idx;
 
-                        if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {
+                        if (unlikely(idx >= bio->bi_vcnt)) {
                                 blk_dump_rq_flags(req, "__end_that");
                                 printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
-                                       __func__, bio->bi_idx, bio->bi_vcnt);
+                                       __func__, idx, bio->bi_vcnt);
                                 break;
                         }