From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 15 Dec 2011 15:07:26 +0000 (+0100)
Subject: Merge branch 'for-3.3/core' into for-next
X-Git-Tag: next-20111220~49^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=954adda825afbbdc18e0b933a565590b21125c1b;p=karo-tx-linux.git

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

Conflicts:
	block/cfq-iosched.c

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

954adda825afbbdc18e0b933a565590b21125c1b
diff --cc block/blk-core.c
index 20d69f6beb6b,8fbdac7010bb..1b4fd93af2c0
--- a/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);