From patchwork Fri Jan 11 00:00:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 10757057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1CC86C5 for ; Fri, 11 Jan 2019 00:01:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF96629D33 for ; Fri, 11 Jan 2019 00:01:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2FF529D48; Fri, 11 Jan 2019 00:01:45 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 62E0129D33 for ; Fri, 11 Jan 2019 00:01:45 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 0516D6204E9; Thu, 10 Jan 2019 16:01:38 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id B9AF721F7B0 for ; Thu, 10 Jan 2019 16:01:35 -0800 (PST) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id E181AAD7F; Fri, 11 Jan 2019 00:01:34 +0000 (UTC) From: NeilBrown To: Oleg Drokin , James Simmons , Andreas Dilger Date: Fri, 11 Jan 2019 11:00:46 +1100 Message-ID: <154716484609.28978.296505839179223953.stgit@noble> In-Reply-To: <154716475327.28978.3817067697027604609.stgit@noble> References: <154716475327.28978.3817067697027604609.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [lustre-devel] [PATCH 4/4] lustre: ptlrpc: change some foo0() to __foo() X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change: nrs_policy_stop0 -> __nrs_policy_stop nrs_svcpt_setup_locked0 -> __nrs_svcpt_setup_locked ptlrpc_nrs_req_get_nolock0 -> __ptlrpc_nrs_req_get_nolock This is more consistent with Linux naming style. Signed-off-by: NeilBrown Reviewed-by: Andreas Dilger Reviewed-by: Nikitas Angelinas --- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 20 ++++++++++---------- drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 2 +- .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs.c b/drivers/staging/lustre/lustre/ptlrpc/nrs.c index e09b86529c5d..248ba045fb79 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/nrs.c +++ b/drivers/staging/lustre/lustre/ptlrpc/nrs.c @@ -82,7 +82,7 @@ static int nrs_policy_ctl_locked(struct ptlrpc_nrs_policy *policy, -ENOSYS; } -static void nrs_policy_stop0(struct ptlrpc_nrs_policy *policy) +static void __nrs_policy_stop(struct ptlrpc_nrs_policy *policy) { if (policy->pol_desc->pd_ops->op_policy_stop) policy->pol_desc->pd_ops->op_policy_stop(policy); @@ -126,7 +126,7 @@ static int nrs_policy_stop_locked(struct ptlrpc_nrs_policy *policy) /* I have the only refcount */ if (policy->pol_ref == 1) - nrs_policy_stop0(policy); + __nrs_policy_stop(policy); return 0; } @@ -151,7 +151,7 @@ static void nrs_policy_stop_primary(struct ptlrpc_nrs *nrs) tmp->pol_state = NRS_POL_STATE_STOPPING; if (tmp->pol_ref == 0) - nrs_policy_stop0(tmp); + __nrs_policy_stop(tmp); } /** @@ -300,7 +300,7 @@ static void nrs_policy_put_locked(struct ptlrpc_nrs_policy *policy) policy->pol_ref--; if (unlikely(policy->pol_ref == 0 && policy->pol_state == NRS_POL_STATE_STOPPING)) - nrs_policy_stop0(policy); + __nrs_policy_stop(policy); } static void nrs_policy_put(struct ptlrpc_nrs_policy *policy) @@ -888,8 +888,8 @@ static int nrs_register_policies_locked(struct ptlrpc_nrs *nrs) * * \pre mutex_is_locked(&nrs_core.nrs_mutex) */ -static int nrs_svcpt_setup_locked0(struct ptlrpc_nrs *nrs, - struct ptlrpc_service_part *svcpt) +static int __nrs_svcpt_setup_locked(struct ptlrpc_nrs *nrs, + struct ptlrpc_service_part *svcpt) { enum ptlrpc_nrs_queue_type queue; @@ -931,7 +931,7 @@ static int nrs_svcpt_setup_locked(struct ptlrpc_service_part *svcpt) * Initialize the regular NRS head. */ nrs = nrs_svcpt2nrs(svcpt, false); - rc = nrs_svcpt_setup_locked0(nrs, svcpt); + rc = __nrs_svcpt_setup_locked(nrs, svcpt); if (rc < 0) goto out; @@ -951,7 +951,7 @@ static int nrs_svcpt_setup_locked(struct ptlrpc_service_part *svcpt) } nrs = nrs_svcpt2nrs(svcpt, true); - rc = nrs_svcpt_setup_locked0(nrs, svcpt); + rc = __nrs_svcpt_setup_locked(nrs, svcpt); out: return rc; @@ -1444,8 +1444,8 @@ static void nrs_request_removed(struct ptlrpc_nrs_policy *policy) * \retval NULL the head has no requests to serve */ struct ptlrpc_request * -ptlrpc_nrs_req_get_nolock0(struct ptlrpc_service_part *svcpt, bool hp, - bool peek, bool force) +__ptlrpc_nrs_req_get_nolock(struct ptlrpc_service_part *svcpt, bool hp, + bool peek, bool force) { struct ptlrpc_nrs *nrs = nrs_svcpt2nrs(svcpt, hp); struct ptlrpc_nrs_policy *policy; diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c index ff630d94dd26..7fe8aeeff428 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c +++ b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c @@ -96,7 +96,7 @@ static int nrs_fifo_start(struct ptlrpc_nrs_policy *policy) * * \param[in] policy The policy to stop * - * \see nrs_policy_stop0() + * \see __nrs_policy_stop() */ static void nrs_fifo_stop(struct ptlrpc_nrs_policy *policy) { diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h index 177010cf7148..da42b99fc36f 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h +++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h @@ -133,14 +133,14 @@ void ptlrpc_nrs_req_add(struct ptlrpc_service_part *svcpt, struct ptlrpc_request *req, bool hp); struct ptlrpc_request * -ptlrpc_nrs_req_get_nolock0(struct ptlrpc_service_part *svcpt, bool hp, - bool peek, bool force); +__ptlrpc_nrs_req_get_nolock(struct ptlrpc_service_part *svcpt, bool hp, + bool peek, bool force); static inline struct ptlrpc_request * ptlrpc_nrs_req_get_nolock(struct ptlrpc_service_part *svcpt, bool hp, bool force) { - return ptlrpc_nrs_req_get_nolock0(svcpt, hp, false, force); + return __ptlrpc_nrs_req_get_nolock(svcpt, hp, false, force); } bool ptlrpc_nrs_req_pending_nolock(struct ptlrpc_service_part *svcpt, bool hp);