block: move sched_tags allocation/de-allocation outside of locking context

[blktests-ci]

Pull request for series with
subject: block: move sched_tags allocation/de-allocation outside of locking context
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=986951

[blktests-ci]

Upstream branch: 260f6f4
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: d6084bb
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 831462f
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: c93529a
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: cbbf0a7
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 6a68cec
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: f2d282e
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 89748ac
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 89748ac
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: bec0771
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 3781648
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 0227b49
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 71a0760
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

[blktests-ci]

Upstream branch: 2988dfe
series: https://patchwork.kernel.org/project/linux-block/list/?series=986951
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=986951
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: block: move elevator queue allocation logic into blk_mq_init_sched
Using index info to reconstruct a base tree...
M	block/bfq-iosched.c
M	block/blk-mq-sched.c
M	block/elevator.c
M	block/elevator.h
M	block/kyber-iosched.c
M	block/mq-deadline.c
Falling back to patching base and 3-way merge...
Auto-merging block/mq-deadline.c
Auto-merging block/kyber-iosched.c
Auto-merging block/elevator.h
Auto-merging block/elevator.c
Auto-merging block/blk-mq-sched.c
CONFLICT (content): Merge conflict in block/blk-mq-sched.c
Auto-merging block/bfq-iosched.c
Patch failed at 0001 block: move elevator queue allocation logic into blk_mq_init_sched'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc block/blk-mq-sched.c
index e2ce4a28e6c9,359e0704e09b..000000000000
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@@ -552,16 -467,22 +552,26 @@@ int blk_mq_init_sched(struct request_qu
  	unsigned long i;
  	int ret;
  
 -	/*
 -	 * Default to double of smaller one between hw queue_depth and 128,
 -	 * since we don't split into sync/async like the old code did.
 -	 * Additionally, this is a per-hw queue depth.
 -	 */
 -	q->nr_requests = 2 * min_t(unsigned int, q->tag_set->queue_depth,
 -				   BLKDEV_DEFAULT_RQ);
 +	eq = elevator_alloc(q, e, et);
 +	if (!eq)
 +		return -ENOMEM;
 +
 +	q->nr_requests = et->nr_requests;
  
+ 	eq = elevator_alloc(q, e);
+ 	if (!eq)
+ 		return -ENOMEM;
+ 
  	if (blk_mq_is_shared_tags(flags)) {
++<<<<<<< HEAD
 +		/* Shared tags are stored at index 0 in @et->tags. */
 +		q->sched_shared_tags = et->tags[0];
 +		blk_mq_tag_update_sched_shared_tags(q);
++=======
+ 		ret = blk_mq_init_sched_shared_tags(q);
+ 		if (ret)
+ 			goto err_put_elevator;
++>>>>>>> block: move elevator queue allocation logic into blk_mq_init_sched
  	}
  
  	queue_for_each_hw_ctx(q, hctx, i) {
@@@ -587,8 -509,10 +597,12 @@@
  	}
  	return 0;
  
 -err_free_map_and_rqs:
 -	blk_mq_sched_free_rqs(q);
 +out:
  	blk_mq_sched_tags_teardown(q, flags);
++<<<<<<< HEAD
++=======
+ err_put_elevator:
++>>>>>>> block: move elevator queue allocation logic into blk_mq_init_sched
  	kobject_put(&eq->kobj);
  	q->elevator = NULL;
  	return ret;