From patchwork Mon Sep 17 17:30:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 10603151 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 BFDD56CB for ; Mon, 17 Sep 2018 17:31:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C009E2A2D6 for ; Mon, 17 Sep 2018 17:31:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEC2A2A2D3; Mon, 17 Sep 2018 17:31:06 +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 58F822A2D6 for ; Mon, 17 Sep 2018 17:31:06 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 5F56221F8D4; Mon, 17 Sep 2018 10:30:58 -0700 (PDT) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 8666521F5DF for ; Mon, 17 Sep 2018 10:30:50 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id BB30D486; Mon, 17 Sep 2018 13:30:46 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id B82E82B7; Mon, 17 Sep 2018 13:30:46 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 17 Sep 2018 13:30:18 -0400 Message-Id: <1537205440-6656-9-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1537205440-6656-1-git-send-email-jsimmons@infradead.org> References: <1537205440-6656-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 08/30] lustre: mgc: Remove unnecessary checks for config_log_put() 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: Steve Guminski , Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Steve Guminski Make config_log_put() check if its parameter is NULL, which makes it is unnecessary to perform the check prior to calling it. This patch removes the redundant checks. Signed-off-by: Steve Guminski WC-bug-id: https://jira.whamcloud.com/browse/LU-9152 Reviewed-on: https://review.whamcloud.com/25854 Reviewed-by: Bob Glossman Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Signed-off-by: James Simmons --- drivers/staging/lustre/lustre/mgc/mgc_request.c | 36 +++++++++++-------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 4552cc5..e6f8d9e 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -131,6 +131,9 @@ static int config_log_get(struct config_llog_data *cld) */ static void config_log_put(struct config_llog_data *cld) { + if (unlikely(!cld)) + return; + CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname, atomic_read(&cld->cld_refcount)); LASSERT(atomic_read(&cld->cld_refcount) > 0); @@ -142,12 +145,9 @@ static void config_log_put(struct config_llog_data *cld) CDEBUG(D_MGC, "dropping config log %s\n", cld->cld_logname); - if (cld->cld_recover) - config_log_put(cld->cld_recover); - if (cld->cld_params) - config_log_put(cld->cld_params); - if (cld->cld_sptlrpc) - config_log_put(cld->cld_sptlrpc); + config_log_put(cld->cld_recover); + config_log_put(cld->cld_params); + config_log_put(cld->cld_sptlrpc); if (cld_is_sptlrpc(cld)) sptlrpc_conf_log_stop(cld->cld_logname); @@ -387,6 +387,9 @@ struct config_llog_data *do_config_log_add(struct obd_device *obd, static inline void config_mark_cld_stop(struct config_llog_data *cld) { + if (!cld) + return; + mutex_lock(&cld->cld_lock); spin_lock(&config_list_lock); cld->cld_stopping = 1; @@ -436,18 +439,13 @@ static int config_log_end(char *logname, struct config_llog_instance *cfg) cld->cld_sptlrpc = NULL; mutex_unlock(&cld->cld_lock); - if (cld_recover) { - config_mark_cld_stop(cld_recover); - config_log_put(cld_recover); - } + config_mark_cld_stop(cld_recover); + config_log_put(cld_recover); - if (cld_params) { - config_mark_cld_stop(cld_params); - config_log_put(cld_params); - } + config_mark_cld_stop(cld_params); + config_log_put(cld_params); - if (cld_sptlrpc) - config_log_put(cld_sptlrpc); + config_log_put(cld_sptlrpc); /* drop the ref from the find */ config_log_put(cld); @@ -593,8 +591,7 @@ static int mgc_requeue_thread(void *data) cld->cld_lostlock = 0; spin_unlock(&config_list_lock); - if (cld_prev) - config_log_put(cld_prev); + config_log_put(cld_prev); cld_prev = cld; if (likely(!(rq_state & RQ_STOP))) { @@ -606,8 +603,7 @@ static int mgc_requeue_thread(void *data) } } spin_unlock(&config_list_lock); - if (cld_prev) - config_log_put(cld_prev); + config_log_put(cld_prev); /* Wait a bit to see if anyone else needs a requeue */ wait_event_idle(rq_waitq, rq_state & (RQ_NOW | RQ_STOP));