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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=no 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 8B0F1C43603 for ; Thu, 5 Dec 2019 00:50:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4DBAA2245C for ; Thu, 5 Dec 2019 00:50:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="OC2sCUIy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DBAA2245C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 023D96B0D87; Wed, 4 Dec 2019 19:50:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F14FF6B0D88; Wed, 4 Dec 2019 19:50:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E53596B0D89; Wed, 4 Dec 2019 19:50:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0135.hostedemail.com [216.40.44.135]) by kanga.kvack.org (Postfix) with ESMTP id D08306B0D87 for ; Wed, 4 Dec 2019 19:50:45 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id A1AE752CC for ; Thu, 5 Dec 2019 00:50:45 +0000 (UTC) X-FDA: 76229257650.13.twig23_6991832e2f0a X-HE-Tag: twig23_6991832e2f0a X-Filterd-Recvd-Size: 4111 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Thu, 5 Dec 2019 00:50:45 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A984B21823; Thu, 5 Dec 2019 00:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575507044; bh=TQnttWr9w0EMXpLRJbGtC7VTr6tjla9BfAWFoCZVgxA=; h=Date:From:To:Subject:In-Reply-To:From; b=OC2sCUIyaplbWuS8UHvdE70IxRWaIaB2AYpoyLT0WBZe77/SizFa05I2kTg6pq4Nd 9rxfQqxKYwwe8PuU6DylCX8kxBiFQBkcv+tDFoDBAR1VzQSZmnFbsJfV96ks4cUetd XqDtOM0X323sOcBw+8vSIn7tctPEYa9NQHXTmQ6w= Date: Wed, 04 Dec 2019 16:50:43 -0800 From: Andrew Morton To: adobriyan@gmail.com, akpm@linux-foundation.org, anna.schumaker@netapp.com, arjan@linux.intel.com, bfields@fieldses.org, chuck.lever@oracle.com, davem@davemloft.net, jlayton@kernel.org, linux-mm@kvack.org, luto@kernel.org, mingo@kernel.org, mm-commits@vger.kernel.org, Nadia.Derbey@bull.net, nixiaoming@huawei.com, paulmck@kernel.org, semen.protsenko@linaro.org, stern@rowland.harvard.edu, tglx@linutronix.de, torvalds@linux-foundation.org, trond.myklebust@hammerspace.com, viresh.kumar@linaro.org, vvs@virtuozzo.com, yuehaibing@huawei.com Subject: [patch 20/86] kernel/notifier.c: remove notifier_chain_cond_register() Message-ID: <20191205005043.FqZ-KD5KD%akpm@linux-foundation.org> In-Reply-To: <20191204164858.fe4ed8886e34ad9f3b34ea00@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Xiaoming Ni Subject: kernel/notifier.c: remove notifier_chain_cond_register() The only difference between notifier_chain_cond_register() and notifier_chain_register() is the lack of warning hints for duplicate registrations. Use notifier_chain_register() instead of notifier_chain_cond_register() to avoid duplicate code Link: http://lkml.kernel.org/r/1568861888-34045-3-git-send-email-nixiaoming@huawei.com Signed-off-by: Xiaoming Ni Reviewed-by: Andrew Morton Cc: Alan Stern Cc: Alexey Dobriyan Cc: Andy Lutomirski Cc: Anna Schumaker Cc: Arjan van de Ven Cc: Chuck Lever Cc: David S. Miller Cc: Ingo Molnar Cc: J. Bruce Fields Cc: Jeff Layton Cc: Nadia Derbey Cc: "Paul E. McKenney" Cc: Sam Protsenko Cc: Thomas Gleixner Cc: Trond Myklebust Cc: Vasily Averin Cc: Viresh Kumar Cc: YueHaibing Signed-off-by: Andrew Morton --- kernel/notifier.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) --- a/kernel/notifier.c~kernel-notifierc-remove-notifier_chain_cond_register +++ a/kernel/notifier.c @@ -36,21 +36,6 @@ static int notifier_chain_register(struc return 0; } -static int notifier_chain_cond_register(struct notifier_block **nl, - struct notifier_block *n) -{ - while ((*nl) != NULL) { - if ((*nl) == n) - return 0; - if (n->priority > (*nl)->priority) - break; - nl = &((*nl)->next); - } - n->next = *nl; - rcu_assign_pointer(*nl, n); - return 0; -} - static int notifier_chain_unregister(struct notifier_block **nl, struct notifier_block *n) { @@ -252,7 +237,7 @@ int blocking_notifier_chain_cond_registe int ret; down_write(&nh->rwsem); - ret = notifier_chain_cond_register(&nh->head, n); + ret = notifier_chain_register(&nh->head, n); up_write(&nh->rwsem); return ret; } _