From d6db0f25c757a6e664dbc2196aa0b5b08c67a81d Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Tue, 28 Mar 2006 09:00:28 +0200
Subject: [PATCH] --- yaml --- r: 24508 b: refs/heads/master c:
 7143dd4b0127141a4f773e819d1d1f4ab82bb517 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/block/ll_rw_blk.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4673f5ab4626..8a9406d747a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a99053ea82a4b4375049886cf1db64d7dcd755
+refs/heads/master: 7143dd4b0127141a4f773e819d1d1f4ab82bb517
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index cb608768ca37..7b23743eb9c5 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -3545,7 +3545,9 @@ void put_io_context(struct io_context *ioc)
 		if (ioc->aic && ioc->aic->dtor)
 			ioc->aic->dtor(ioc->aic);
 		if (ioc->cic_root.rb_node != NULL) {
-			cic = rb_entry(rb_first(&ioc->cic_root), struct cfq_io_context, rb_node);
+			struct rb_node *n = rb_first(&ioc->cic_root);
+
+			cic = rb_entry(n, struct cfq_io_context, rb_node);
 			cic->dtor(ioc);
 		}
 		rcu_read_unlock();