On Sun, Sep 18, 2016 at 09:37:16AM +0200, Alexander Gordeev wrote:
> CC: linux-block@vger.kernel.org
> Signed-off-by: Alexander Gordeev <agord...@redhat.com>
Makes sense.
Reviewed-by: Omar Sandoval <osan...@fb.com>
> ---
> block/blk-mq.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index a38fd2e..9fbfe31 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -1712,13 +1712,9 @@ static int blk_mq_init_hctx(struct request_queue *q,
> struct blk_mq_tag_set *set,
> struct blk_mq_hw_ctx *hctx, unsigned hctx_idx)
> {
> - int node;
> + int node = hctx->numa_node;
> unsigned flush_start_tag = set->queue_depth;
>
> - node = hctx->numa_node;
> - if (node == NUMA_NO_NODE)
> - node = hctx->numa_node = set->numa_node;
> -
> INIT_WORK(&hctx->run_work, blk_mq_run_work_fn);
> INIT_DELAYED_WORK(&hctx->delay_work, blk_mq_delay_work_fn);
> spin_lock_init(&hctx->lock);
> @@ -1999,6 +1995,9 @@ static void blk_mq_realloc_hw_ctxs(struct
> blk_mq_tag_set *set,
> break;
>
> node = blk_mq_hw_queue_to_node(q->mq_map, i);
> + if (node == NUMA_NO_NODE)
> + node = set->numa_node;
> +
> hctxs[i] = kzalloc_node(sizeof(struct blk_mq_hw_ctx),
> GFP_KERNEL, node);
> if (!hctxs[i])
> --
> 1.8.3.1
>
--
Omar
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
