Merge branch 'for-linus' into for-4.1/core (64f9b683) · Commits · e / devices / android_kernel_teracube_2e

block/blk-mq.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1938,7 +1938,7 @@ struct request_queue blk_mq_init_queue(struct blk_mq_tag_set set)
		*/
		if (percpu_ref_init(&q->mq_usage_counter, blk_mq_usage_counter_release,
		PERCPU_REF_INIT_ATOMIC, GFP_KERNEL))
		goto err_map;
		goto err_mq_usage;

		setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q);
		blk_queue_rq_timeout(q, 30000);
		@@ -1981,7 +1981,7 @@ struct request_queue blk_mq_init_queue(struct blk_mq_tag_set set)
		blk_mq_init_cpu_queues(q, set->nr_hw_queues);

		if (blk_mq_init_hw_queues(q, set))
		goto err_hw;
		goto err_mq_usage;

		mutex_lock(&all_q_mutex);
		list_add_tail(&q->all_q_node, &all_q_list);
		@@ -1993,7 +1993,7 @@ struct request_queue blk_mq_init_queue(struct blk_mq_tag_set set)

		return q;

		err_hw:
		err_mq_usage:
		blk_cleanup_queue(q);
		err_hctxs:
		kfree(map);

+4 −4

Original line number	Diff line number	Diff line
		@@ -803,10 +803,6 @@ static int __init nbd_init(void)
		return -EINVAL;
		}

		nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
		if (!nbd_dev)
		return -ENOMEM;

		part_shift = 0;
		if (max_part > 0) {
		part_shift = fls(max_part);
		@@ -828,6 +824,10 @@ static int __init nbd_init(void)
		if (nbds_max > 1UL << (MINORBITS - part_shift))
		return -EINVAL;

		nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
		if (!nbd_dev)
		return -ENOMEM;

		for (i = 0; i < nbds_max; i++) {
		struct gendisk *disk = alloc_disk(1 << part_shift);
		if (!disk)

+1 −1

Original line number	Diff line number	Diff line
		@@ -922,7 +922,7 @@ static void global_update_bandwidth(unsigned long thresh,
		unsigned long now)
		{
		static DEFINE_SPINLOCK(dirty_lock);
		static unsigned long update_time;
		static unsigned long update_time = INITIAL_JIFFIES;

		/*
		* check locklessly first to optimize away locking for the most time