block: rename __blk_mq_alloc_rq_map (03b63b02) · Commits · 戴 / test

block/blk-mq.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2485,7 +2485,8 @@ static void blk_mq_init_cpu_queues(struct request_queue *q,
		}
		}

		static bool __blk_mq_alloc_rq_map(struct blk_mq_tag_set *set, int hctx_idx)
		static bool __blk_mq_alloc_map_and_request(struct blk_mq_tag_set *set,
		int hctx_idx)
		{
		int ret = 0;

		@@ -2544,7 +2545,7 @@ static void blk_mq_map_swqueue(struct request_queue *q)
		hctx_idx = set->map[j].mq_map[i];
		/* unmapped hw queue can be remapped after CPU topo changed */
		if (!set->tags[hctx_idx] &&
		!__blk_mq_alloc_rq_map(set, hctx_idx)) {
		!__blk_mq_alloc_map_and_request(set, hctx_idx)) {
		/*
		* If tags initialization fail for some hctx,
		* that hctx won't be brought online. In this
		@@ -2999,7 +3000,7 @@ static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)
		int i;

		for (i = 0; i < set->nr_hw_queues; i++)
		if (!__blk_mq_alloc_rq_map(set, i))
		if (!__blk_mq_alloc_map_and_request(set, i))
		goto out_unwind;

		return 0;