cfq-iosched: fix RCU race in the cfq io_context destructor handling

[safe/jmp/linux-2.6] / block / blk-ioc.c

diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index e34df7c..012f065 100644 (file)
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -41,8 +41,8 @@ int put_io_context(struct io_context *ioc)
                rcu_read_lock();
                if (ioc->aic && ioc->aic->dtor)
                        ioc->aic->dtor(ioc->aic);
-               rcu_read_unlock();
                cfq_dtor(ioc);
+               rcu_read_unlock();
 
                kmem_cache_free(iocontext_cachep, ioc);
                return 1;