From 78b06bbe58354ebb102e21ff5bd5d8ff223c9cc3 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Mon, 27 Jun 2005 10:55:49 +0200
Subject: [PATCH] --- yaml --- r: 3500 b: refs/heads/master c:
 3d25f3566bb606720a67caef77b16190df10dd98 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/block/cfq-iosched.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7a74df4f93fb..090bf214aae5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22e2c507c301c3dbbcf91b4948b88f78842ee6c9
+refs/heads/master: 3d25f3566bb606720a67caef77b16190df10dd98
diff --git a/trunk/drivers/block/cfq-iosched.c b/trunk/drivers/block/cfq-iosched.c
index 35f6e569d5e5..baa3e268250a 100644
--- a/trunk/drivers/block/cfq-iosched.c
+++ b/trunk/drivers/block/cfq-iosched.c
@@ -375,9 +375,10 @@ cfq_find_next_crq(struct cfq_data *cfqd, struct cfq_queue *cfqq,
 	struct cfq_rq *crq_next = NULL, *crq_prev = NULL;
 	struct rb_node *rbnext, *rbprev;
 
+	rbnext = NULL;
 	if (ON_RB(&last->rb_node))
 		rbnext = rb_next(&last->rb_node);
-	else {
+	if (!rbnext) {
 		rbnext = rb_first(&cfqq->sort_list);
 		if (rbnext == &last->rb_node)
 			rbnext = NULL;