From nobody Wed Feb 11 11:02:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0174DC76196 for ; Thu, 6 Apr 2023 14:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230111AbjDFOwn (ORCPT ); Thu, 6 Apr 2023 10:52:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239223AbjDFOwZ (ORCPT ); Thu, 6 Apr 2023 10:52:25 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DBD3A24C for ; Thu, 6 Apr 2023 07:51:09 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id qe8-20020a17090b4f8800b0023f07253a2cso40838479pjb.3 for ; Thu, 06 Apr 2023 07:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1680792666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hvxogFZ7tzo2z7dxF0J9Y3jJgkG796IBeY87z8Qv1kQ=; b=PxWqmBRUj4WBnZSfVzpRfLqostqKXR8X10+oF706WENnUQNTAeGyug62X2dsa4tpYN TmZJqensASXgsRSvYlajRgHSMIgj2iFr/xVKZh8tJZGDsoodlod6SdH5oK9lq7q+7ePl eaWtyww8e1C07Wfpb5nER82j3g66y0RauEyorkQixXonVxmvCfIDmD6SHJ6PzTQihsqe I2AQUXe4NtRjpaxWSZwm/sykWFD+1zLra0dC+oUYexpzGyYlq9uYv7vXgtDPypULn3GD qClosOFu9bbC+DXhM1sMN06zbLRpwPyZr8aDAP28l2d16iq49K4A3UQfJINl2MstFl0K VtEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680792666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hvxogFZ7tzo2z7dxF0J9Y3jJgkG796IBeY87z8Qv1kQ=; b=jK0nmum7b3fNcZZyYRphIGvBFOX3eFMeN7gnUA8rwCf0JTxfXqEt/+1tDgtuodnz02 +JK6LS3GENcaL5ubkIgy2BaS908CSToBpVM7qZTFgbaeZPC3AL5MSWNmI8G9UzUX7gUD n68S/qmCSZp4eA6MFOZX93QEHYM7A83RDXRjPNbj2JZ9B/m9yzcjOUzLS6JJiO9m00Hp j9BfNfHaK8WDM4j+McSjfYyWypfpd5k/ZAeM6uM18/dwAPSUDY/Iy0NcilRjrJK4V+Kz qSRKdxHkT9GzycSV1Rt5gTOIcKPRpxD9W9XELBMP5qFE2FhRR2ZmrtJX4/GmA6PGfd+f d9Qw== X-Gm-Message-State: AAQBX9eYmpuTJiKRirPNNnJbNCiDeOMNhsLXR3gsiR61hKwX69lkCuR+ J+Sc8oN5xdqJg67GB+ebi0anvA== X-Google-Smtp-Source: AKy350YMOAAXOd9Wtpy7569VRlFO8zc9dgQrOSpbdZ975Faxy8Ltu9r0KG6OuX3tcNR0EjtuUJaFTA== X-Received: by 2002:a17:903:22cd:b0:1a2:8924:224d with SMTP id y13-20020a17090322cd00b001a28924224dmr12472230plg.59.1680792665876; Thu, 06 Apr 2023 07:51:05 -0700 (PDT) Received: from localhost.localdomain ([2409:8a28:e63:f500:18d3:10f7:2e64:a1a7]) by smtp.gmail.com with ESMTPSA id i4-20020a170902eb4400b0019ca68ef7c3sm1487398pli.74.2023.04.06.07.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 07:51:05 -0700 (PDT) From: Chengming Zhou To: axboe@kernel.dk, tj@kernel.org Cc: paolo.valente@linaro.org, josef@toxicpanda.com, linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Chengming Zhou Subject: [PATCH v2 1/3] block, bfq: remove BFQ_WEIGHT_LEGACY_DFL Date: Thu, 6 Apr 2023 22:50:48 +0800 Message-Id: <20230406145050.49914-2-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230406145050.49914-1-zhouchengming@bytedance.com> References: <20230406145050.49914-1-zhouchengming@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" BFQ_WEIGHT_LEGACY_DFL is the same as CGROUP_WEIGHT_DFL, which means we don't need cpd_bind_fn() callback to update default weight when attached to a hierarchy. This patch remove BFQ_WEIGHT_LEGACY_DFL and cpd_bind_fn(). Signed-off-by: Chengming Zhou Acked-by: Tejun Heo --- block/bfq-cgroup.c | 4 +--- block/bfq-iosched.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 89ffb3aa992c..a2ab5dd58068 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -504,8 +504,7 @@ static void bfq_cpd_init(struct blkcg_policy_data *cpd) { struct bfq_group_data *d =3D cpd_to_bfqgd(cpd); =20 - d->weight =3D cgroup_subsys_on_dfl(io_cgrp_subsys) ? - CGROUP_WEIGHT_DFL : BFQ_WEIGHT_LEGACY_DFL; + d->weight =3D CGROUP_WEIGHT_DFL; } =20 static void bfq_cpd_free(struct blkcg_policy_data *cpd) @@ -1302,7 +1301,6 @@ struct blkcg_policy blkcg_policy_bfq =3D { =20 .cpd_alloc_fn =3D bfq_cpd_alloc, .cpd_init_fn =3D bfq_cpd_init, - .cpd_bind_fn =3D bfq_cpd_init, .cpd_free_fn =3D bfq_cpd_free, =20 .pd_alloc_fn =3D bfq_pd_alloc, diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 69aaee52285a..467e8cfc41a2 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -20,7 +20,6 @@ =20 #define BFQ_DEFAULT_QUEUE_IOPRIO 4 =20 -#define BFQ_WEIGHT_LEGACY_DFL 100 #define BFQ_DEFAULT_GRP_IOPRIO 0 #define BFQ_DEFAULT_GRP_CLASS IOPRIO_CLASS_BE =20 --=20 2.39.2 From nobody Wed Feb 11 11:02:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE51FC761A6 for ; Thu, 6 Apr 2023 14:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239365AbjDFOwv (ORCPT ); Thu, 6 Apr 2023 10:52:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239398AbjDFOwb (ORCPT ); Thu, 6 Apr 2023 10:52:31 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A76D7A276 for ; Thu, 6 Apr 2023 07:51:12 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id le6so37689178plb.12 for ; Thu, 06 Apr 2023 07:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1680792669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HhKhQOgHY4omeSf5oEZtApwayoKc6MIO22TQQuOJpsE=; b=CZieEMBTQy1sXreaOD5ONqXZQm9UZPO2FMYEGmaNnkHl66lF7X+TBFOBF6YevEuu8i 3Un4k80LJ/JCkwFV5Sh2Sy/bEr8qsUPVwTEVaLCnDM7bLXbriwFdcGb0kp5rcx24Z+S4 KTTkHmaT256dZfW4jWHyf4zlv/oHcnh+7+HqdkStMzmJ0UgKtY9uiliIZwqdHLzNML6R vMURaaBcOSPsvGPNdYwg5hrkebPPacRI9ZQresV32Nc6IzjvZHk1zUDKaQU1BoBryxgI oKT7HJQsPcdgYvEb0bhL8hVdsV1uB5W8kEneVCkEVjDIEv0GA7zDkS3RCzs+xtmQ5Z25 NJxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680792669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HhKhQOgHY4omeSf5oEZtApwayoKc6MIO22TQQuOJpsE=; b=e1hywTJ5Km9zrxfoMhNLlvUf4KJSEK3bprqp9p+DcjhWwJOmAfTBSNq5HXAvzyOkVK yHrYQcEjCp4q0P3TWmPW2S0C3nx6/lIMiYVHyJF0reoVV0bqhwwKikVLa0CEQjEUj48y ZvUIPlWQF4C82QwU/c/UCPBUsw+nxqiETAWd3u4g5M7ugtmA32criBb9Mr20Uqxqca/7 UkY1kjiQMfC2ud7QP6BZGFxlqs0tr75dR8u24r8jRPlOoE+79XngKhv/7LPW6Vm6EhCm cYAELccafbMcImU80tB0VCEhvbD37Apb9vTGFuvZ/KtUA/PbYdBwJs1gt6GTSQ8/KIiy zu+Q== X-Gm-Message-State: AAQBX9c/I7jadRsXNEL8JSxueYORevZC3VTf58S+RbtzAMSDgKE/6bGI ZFA+4lhxZoBNgcfKzYl7Q8kTCw== X-Google-Smtp-Source: AKy350ZQlx8Idn2uhz4vLL63pEGLj/FKmdzGq3i37RUJDB+3tHU2onX4M5SQjH88NwD6MJymZZGhsA== X-Received: by 2002:a17:902:d510:b0:1a1:8007:d370 with SMTP id b16-20020a170902d51000b001a18007d370mr7141311plg.33.1680792668969; Thu, 06 Apr 2023 07:51:08 -0700 (PDT) Received: from localhost.localdomain ([2409:8a28:e63:f500:18d3:10f7:2e64:a1a7]) by smtp.gmail.com with ESMTPSA id i4-20020a170902eb4400b0019ca68ef7c3sm1487398pli.74.2023.04.06.07.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 07:51:08 -0700 (PDT) From: Chengming Zhou To: axboe@kernel.dk, tj@kernel.org Cc: paolo.valente@linaro.org, josef@toxicpanda.com, linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Chengming Zhou Subject: [PATCH v2 2/3] blk-cgroup: delete cpd_bind_fn of blkcg_policy Date: Thu, 6 Apr 2023 22:50:49 +0800 Message-Id: <20230406145050.49914-3-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230406145050.49914-1-zhouchengming@bytedance.com> References: <20230406145050.49914-1-zhouchengming@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" cpd_bind_fn is just used for update default weight when block subsys attached to a hierarchy. No any policy need it anymore. Signed-off-by: Chengming Zhou Acked-by: Tejun Heo --- block/blk-cgroup.c | 21 --------------------- block/blk-cgroup.h | 1 - 2 files changed, 22 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 18c922579719..f663178f3a19 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1395,26 +1395,6 @@ void blkcg_exit_disk(struct gendisk *disk) blk_throtl_exit(disk); } =20 -static void blkcg_bind(struct cgroup_subsys_state *root_css) -{ - int i; - - mutex_lock(&blkcg_pol_mutex); - - for (i =3D 0; i < BLKCG_MAX_POLS; i++) { - struct blkcg_policy *pol =3D blkcg_policy[i]; - struct blkcg *blkcg; - - if (!pol || !pol->cpd_bind_fn) - continue; - - list_for_each_entry(blkcg, &all_blkcgs, all_blkcgs_node) - if (blkcg->cpd[pol->plid]) - pol->cpd_bind_fn(blkcg->cpd[pol->plid]); - } - mutex_unlock(&blkcg_pol_mutex); -} - static void blkcg_exit(struct task_struct *tsk) { if (tsk->throttle_disk) @@ -1428,7 +1408,6 @@ struct cgroup_subsys io_cgrp_subsys =3D { .css_offline =3D blkcg_css_offline, .css_free =3D blkcg_css_free, .css_rstat_flush =3D blkcg_rstat_flush, - .bind =3D blkcg_bind, .dfl_cftypes =3D blkcg_files, .legacy_cftypes =3D blkcg_legacy_files, .legacy_name =3D "blkio", diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index e98d2c1be354..073488b9c7a0 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -176,7 +176,6 @@ struct blkcg_policy { blkcg_pol_alloc_cpd_fn *cpd_alloc_fn; blkcg_pol_init_cpd_fn *cpd_init_fn; blkcg_pol_free_cpd_fn *cpd_free_fn; - blkcg_pol_bind_cpd_fn *cpd_bind_fn; =20 blkcg_pol_alloc_pd_fn *pd_alloc_fn; blkcg_pol_init_pd_fn *pd_init_fn; --=20 2.39.2 From nobody Wed Feb 11 11:02:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 879F8C76196 for ; Thu, 6 Apr 2023 14:52:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237582AbjDFOwa (ORCPT ); Thu, 6 Apr 2023 10:52:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238100AbjDFOwM (ORCPT ); Thu, 6 Apr 2023 10:52:12 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B168B778 for ; Thu, 6 Apr 2023 07:51:14 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id j13so37462422pjd.1 for ; Thu, 06 Apr 2023 07:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1680792672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4IukBswUItQA0MwJ6mr8lJHmbvkt98zOHJDlzuZ9xc8=; b=iRJlt1CJvMm9eA18RMsi4Pd2vmqTpZST7WKy5PYRQriAE6O/3yD7tZ46f159yNbdWd sWkHmJyRT1QPOpKg1FKIakni2SeNhFvE47g04BKr12DCIKMh5ntJ8Bhq++/2LSXORGQk 81N2B5tvbHSyGgxcdDOX6g+f+n/1cRHK2LWyUferpNf/DBOa02WAou5MUpMmVmafqLT5 X0hpmy3pNW832fIRF8gT3xx7WlcPuwgoseI7QevKWW1jDeRF0C3XA6YUMBdgE0HE/zEH CFK2P57NKeaxPyOJZPLj/9/XBA61NM442z53Dnz6jwJ/G0q1piRk0XHrxw84/n75W0mq CEsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680792672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4IukBswUItQA0MwJ6mr8lJHmbvkt98zOHJDlzuZ9xc8=; b=TBa7aqQoqyX/Pnc7ZtkHVzp315nJNV5FrLZjiN4ueH0rUv1MHiNMhwXWZeeemAnotF jyFFyPabsgDulVhgWybLNLaZwoXrA48sPxeIFmI6U+b12eUv4y+2Rr7m/VaBP4qwEX2A vIXQ1kxItNDDY0T2y/a/A5u2FXV4DX/O+Kk1c48X/IzFTUO2pYyofjYeXe3QjcYdetD2 m9+SHQjtaJu5ODRnL2NGrg38XOHhI8GWPb8idLlMFmRweGPBbVUsZciTUoMyB1WYqwZu IcFah0fXxKAVeEbZuHez6nC16d5KeMMjR5Lioo1MYiMtUSIEJPqcHC9usdOuh2WlSa6c LijQ== X-Gm-Message-State: AAQBX9fctR8ucUdrn6PEug4+oQYGMjqeYBn4SdIFnTFQN1/o++5ih/wD 6D73Xu8p22I5HB/bCG9cgA574A== X-Google-Smtp-Source: AKy350bKD/N614XCLXav3ebLsFXgDjtshr3+E7sESXsbgXqxHi+VsF3jJtgjKaWQ49jOjPijP3JTtA== X-Received: by 2002:a17:903:11d1:b0:19f:1c64:c9d8 with SMTP id q17-20020a17090311d100b0019f1c64c9d8mr12440320plh.14.1680792672041; Thu, 06 Apr 2023 07:51:12 -0700 (PDT) Received: from localhost.localdomain ([2409:8a28:e63:f500:18d3:10f7:2e64:a1a7]) by smtp.gmail.com with ESMTPSA id i4-20020a170902eb4400b0019ca68ef7c3sm1487398pli.74.2023.04.06.07.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 07:51:11 -0700 (PDT) From: Chengming Zhou To: axboe@kernel.dk, tj@kernel.org Cc: paolo.valente@linaro.org, josef@toxicpanda.com, linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Chengming Zhou Subject: [PATCH v2 3/3] blk-cgroup: delete cpd_init_fn of blkcg_policy Date: Thu, 6 Apr 2023 22:50:50 +0800 Message-Id: <20230406145050.49914-4-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230406145050.49914-1-zhouchengming@bytedance.com> References: <20230406145050.49914-1-zhouchengming@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" blkcg_policy cpd_init_fn() is used to just initialize some default fields of policy data, which is enough to do in cpd_alloc_fn(). This patch delete the only user bfq_cpd_init(), and remove cpd_init_fn from blkcg_policy. Signed-off-by: Chengming Zhou Acked-by: Tejun Heo --- block/bfq-cgroup.c | 10 ++-------- block/blk-cgroup.c | 4 ---- block/blk-cgroup.h | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index a2ab5dd58068..74f7d051665b 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -497,14 +497,9 @@ static struct blkcg_policy_data *bfq_cpd_alloc(gfp_t g= fp) bgd =3D kzalloc(sizeof(*bgd), gfp); if (!bgd) return NULL; - return &bgd->pd; -} =20 -static void bfq_cpd_init(struct blkcg_policy_data *cpd) -{ - struct bfq_group_data *d =3D cpd_to_bfqgd(cpd); - - d->weight =3D CGROUP_WEIGHT_DFL; + bgd->weight =3D CGROUP_WEIGHT_DFL; + return &bgd->pd; } =20 static void bfq_cpd_free(struct blkcg_policy_data *cpd) @@ -1300,7 +1295,6 @@ struct blkcg_policy blkcg_policy_bfq =3D { .legacy_cftypes =3D bfq_blkcg_legacy_files, =20 .cpd_alloc_fn =3D bfq_cpd_alloc, - .cpd_init_fn =3D bfq_cpd_init, .cpd_free_fn =3D bfq_cpd_free, =20 .pd_alloc_fn =3D bfq_pd_alloc, diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index f663178f3a19..5fa77f32a52b 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1289,8 +1289,6 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_cs= s) blkcg->cpd[i] =3D cpd; cpd->blkcg =3D blkcg; cpd->plid =3D i; - if (pol->cpd_init_fn) - pol->cpd_init_fn(cpd); } =20 spin_lock_init(&blkcg->lock); @@ -1645,8 +1643,6 @@ int blkcg_policy_register(struct blkcg_policy *pol) blkcg->cpd[pol->plid] =3D cpd; cpd->blkcg =3D blkcg; cpd->plid =3D pol->plid; - if (pol->cpd_init_fn) - pol->cpd_init_fn(cpd); } } =20 diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 073488b9c7a0..6794157ea1eb 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -174,7 +174,6 @@ struct blkcg_policy { =20 /* operations */ blkcg_pol_alloc_cpd_fn *cpd_alloc_fn; - blkcg_pol_init_cpd_fn *cpd_init_fn; blkcg_pol_free_cpd_fn *cpd_free_fn; =20 blkcg_pol_alloc_pd_fn *pd_alloc_fn; --=20 2.39.2