Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2 files changed, 7 insertions, 4 deletions

diff --git a/block/Kconfig b/block/Kconfig
index 9bda7bc80307..7db9a411649d 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -38,7 +38,7 @@ config BLK_DEV_IO_TRACE
           on a block device queue. For more information (and the user space
           support tools needed), fetch the blktrace app from:
 
-          git://brick.kernel.dk/data/git/blktrace.git
+          git://git.kernel.dk/blktrace.git
 
 config LSF
         bool "Support for Large Single Files"
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index f26da2bfcc15..f4e1006c253d 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1214,6 +1214,8 @@ static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 static void __cfq_exit_single_io_context(struct cfq_data *cfqd,
                                          struct cfq_io_context *cic)
 {
+        struct io_context *ioc = cic->ioc;
+
         list_del_init(&cic->queue_list);
 
         /*
@@ -1223,6 +1225,9 @@ static void __cfq_exit_single_io_context(struct cfq_data *cfqd,
         cic->dead_key = (unsigned long) cic->key;
         cic->key = NULL;
 
+        if (ioc->ioc_data == cic)
+                rcu_assign_pointer(ioc->ioc_data, NULL);
+
         if (cic->cfqq[ASYNC]) {
                 cfq_exit_cfqq(cfqd, cic->cfqq[ASYNC]);
                 cic->cfqq[ASYNC] = NULL;
@@ -1255,7 +1260,6 @@ static void cfq_exit_single_io_context(struct io_context *ioc,
  */
 static void cfq_exit_io_context(struct io_context *ioc)
 {
-        rcu_assign_pointer(ioc->ioc_data, NULL);
         call_for_each_cic(ioc, cfq_exit_single_io_context);
 }
 
@@ -1478,8 +1482,7 @@ cfq_drop_dead_cic(struct cfq_data *cfqd, struct io_context *ioc,
 
         spin_lock_irqsave(&ioc->lock, flags);
 
-        if (ioc->ioc_data == cic)
-                rcu_assign_pointer(ioc->ioc_data, NULL);
+        BUG_ON(ioc->ioc_data == cic);
 
         radix_tree_delete(&ioc->radix_root, (unsigned long) cfqd);
         hlist_del_rcu(&cic->cic_list);