From patchwork Tue Feb 21 17:09:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 9585193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 527A3600CA for ; Tue, 21 Feb 2017 17:10:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F6A22851A for ; Tue, 21 Feb 2017 17:10:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 339B72861E; Tue, 21 Feb 2017 17:10:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D921C2851A for ; Tue, 21 Feb 2017 17:10:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753497AbdBURKd (ORCPT ); Tue, 21 Feb 2017 12:10:33 -0500 Received: from mx2.suse.de ([195.135.220.15]:56292 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753987AbdBURKY (ORCPT ); Tue, 21 Feb 2017 12:10:24 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5F1C2ADC8; Tue, 21 Feb 2017 17:10:19 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 65BC61E10DA; Tue, 21 Feb 2017 18:10:16 +0100 (CET) From: Jan Kara To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Dan Williams , Thiago Jung Bauermann , Lekshmi Pillai , Tejun Heo , NeilBrown , Omar Sandoval , Jan Kara Subject: [PATCH 10/13] bdi: Rename cgwb_bdi_destroy() to cgwb_bdi_unregister() Date: Tue, 21 Feb 2017 18:09:55 +0100 Message-Id: <20170221170958.21845-11-jack@suse.cz> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170221170958.21845-1-jack@suse.cz> References: <20170221170958.21845-1-jack@suse.cz> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename cgwb_bdi_destroy() to cgwb_bdi_unregister() as it gets called from bdi_unregister() which is not necessarily called from bdi_destroy() and thus the name is somewhat misleading. Signed-off-by: Jan Kara Acked-by: Tejun Heo --- mm/backing-dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 31cdee91e826..b1b50cce3f36 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -687,7 +687,7 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi) return ret; } -static void cgwb_bdi_destroy(struct backing_dev_info *bdi) +static void cgwb_bdi_unregister(struct backing_dev_info *bdi) { struct radix_tree_iter iter; struct rb_node *rbn; @@ -777,7 +777,7 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi) static void cgwb_remove_from_bdi_list(struct bdi_writeback *wb) { } -static void cgwb_bdi_destroy(struct backing_dev_info *bdi) { } +static void cgwb_bdi_unregister(struct backing_dev_info *bdi) { } #endif /* CONFIG_CGROUP_WRITEBACK */ @@ -885,7 +885,7 @@ void bdi_unregister(struct backing_dev_info *bdi) /* make sure nobody finds us on the bdi_list anymore */ bdi_remove_from_list(bdi); wb_shutdown(&bdi->wb); - cgwb_bdi_destroy(bdi); + cgwb_bdi_unregister(bdi); if (bdi->dev) { bdi_debug_unregister(bdi);