From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C20ECC433E7 for ; Fri, 16 Oct 2020 13:31:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 638D12087D for ; Fri, 16 Oct 2020 13:31:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="uQjZ6R/T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408071AbgJPNb5 (ORCPT ); Fri, 16 Oct 2020 09:31:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408054AbgJPNb4 (ORCPT ); Fri, 16 Oct 2020 09:31:56 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FE96C061755 for ; Fri, 16 Oct 2020 06:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=+NkbxqmYZkb3NvJTMPdsdcushUdMVZQRBEUzMmtHWk8=; b=uQjZ6R/TzgscHJ8tmNGZKQJCHg eD7wfjH4jqdCszcLHnK7RLgnIyIFUmWoVF5Ergpqw1VS2gnc4m51BuaqTJ9F77AwaWl53TR9LtSsY OBd5nic8mwUHSu30wbMYWOWxR6vgHB46uDVASQN2TNe9VXBW1GJVrmyjvrdSKVi/o7Ua1/IThwtFA y37trwOis4fFELclJ6Q7/nB7iqVymZwwXjsggblzEUx7sn3XV0RuQPYvhTOM9VSzukD+GXsrbQrex kavZaG/12oaErh9ScSPnXaLNPedf8Tvsm7aaErFJvW1wL5Wos3pCsa+/5X3Ecrwu8zsHvSSG4NsP3 6lZfYebw==; Received: from 213-225-9-134.nat.highway.a1.net ([213.225.9.134] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTPpj-0003ON-7X; Fri, 16 Oct 2020 13:31:47 +0000 From: Christoph Hellwig To: Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , WeiXiong Liao Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/9] pstore/blk: remove __unregister_pstore_blk Date: Fri, 16 Oct 2020 15:20:42 +0200 Message-Id: <20201016132047.3068029-5-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201016132047.3068029-1-hch@lst.de> References: <20201016132047.3068029-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fold __unregister_pstore_blk into its only caller, and merge the two identical calls to __unregister_pstore_device that exist in the caller now. Signed-off-by: Christoph Hellwig --- fs/pstore/blk.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c index 7f8368e94b3604..3a2214ecf942ae 100644 --- a/fs/pstore/blk.c +++ b/fs/pstore/blk.c @@ -388,19 +388,6 @@ static int __register_pstore_blk(void) return ret; } -static void __unregister_pstore_blk(unsigned int major) -{ - struct pstore_device_info dev = { .read = psblk_generic_blk_read }; - void *holder = blkdev; - - lockdep_assert_held(&pstore_blk_lock); - if (psblk_bdev && MAJOR(psblk_bdev->bd_dev) == major) { - __unregister_pstore_device(&dev); - psblk_put_bdev(psblk_bdev, holder); - psblk_bdev = NULL; - } -} - /* get information of pstore/blk */ int pstore_blk_get_config(struct pstore_blk_config *info) { @@ -430,16 +417,14 @@ late_initcall(pstore_blk_init); static void __exit pstore_blk_exit(void) { + struct pstore_device_info dev = { }; + mutex_lock(&pstore_blk_lock); + if (pstore_zone_info) + dev.read = pstore_zone_info->read; + __unregister_pstore_device(&dev); if (psblk_bdev) - __unregister_pstore_blk(MAJOR(psblk_bdev->bd_dev)); - else { - struct pstore_device_info dev = { }; - - if (pstore_zone_info) - dev.read = pstore_zone_info->read; - __unregister_pstore_device(&dev); - } + psblk_put_bdev(psblk_bdev, blkdev); mutex_unlock(&pstore_blk_lock); } module_exit(pstore_blk_exit); -- 2.28.0