Merge branch 'for-3.3/core' into for-next

Conflicts:
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc block/blk-core.c
index 20d69f6beb6ba165cfa601aa176071bde3a10555,8fbdac7010bb425fb025f156a1fe4210e58428b9..1b4fd93af2c03d82cf767078fd8760b957b5041e
--- 1/block/blk-core.c
--- 2/block/blk-core.c
+++ b/block/blk-core.c
@@@ -467,18 -485,13 +485,14 @@@ struct request_queue *blk_alloc_queue_n
        q->backing_dev_info.state = 0;
        q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;
        q->backing_dev_info.name = "block";
 +      q->node = node_id;
  
        err = bdi_init(&q->backing_dev_info);
-       if (err) {
-               kmem_cache_free(blk_requestq_cachep, q);
-               return NULL;
-       }
+       if (err)
+               goto fail_id;
  
-       if (blk_throtl_init(q)) {
-               kmem_cache_free(blk_requestq_cachep, q);
-               return NULL;
-       }
+       if (blk_throtl_init(q))
+               goto fail_id;
  
        setup_timer(&q->backing_dev_info.laptop_mode_wb_timer,
                    laptop_mode_timer_fn, (unsigned long) q);
@@@ -596,16 -625,16 +617,16 @@@ blk_init_allocated_queue(struct request
  
        return NULL;
  }
 -EXPORT_SYMBOL(blk_init_allocated_queue_node);
 +EXPORT_SYMBOL(blk_init_allocated_queue);
  
- int blk_get_queue(struct request_queue *q)
+ bool blk_get_queue(struct request_queue *q)
  {
-       if (likely(!test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) {
-               kobject_get(&q->kobj);
-               return 0;
+       if (likely(!blk_queue_dead(q))) {
+               __blk_get_queue(q);
+               return true;
        }
  
-       return 1;
+       return false;
  }
  EXPORT_SYMBOL(blk_get_queue);
  

diff --cc block/cfq-iosched.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge