From patchwork Sat Jun 13 16:26:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11602875 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D7A6E1392 for ; Sat, 13 Jun 2020 16:27:25 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BFC0E2078A for ; Sat, 13 Jun 2020 16:27:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFC0E2078A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 4C9CA21C9CD; Sat, 13 Jun 2020 09:27:24 -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 386E621C90F for ; Sat, 13 Jun 2020 09:27:23 -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 84B6524F; Sat, 13 Jun 2020 12:27:19 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 7AA4D2A8; Sat, 13 Jun 2020 12:27:19 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Sat, 13 Jun 2020 12:26:58 -0400 Message-Id: <1592065636-28333-3-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592065636-28333-1-git-send-email-jsimmons@infradead.org> References: <1592065636-28333-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 02/20] lnet: test against LNET_STATE_RUNNING rather than LNET_STATE_SHUTDOWN 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 MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: NeilBrown The difference between LNET_STATE_STOPPING and LNET_STATE_SHUTDOWN is of little interest. As soon as the state isn't LNET_STATE_RUNNING, various API calls should refuse to act. So change tests for SHUTDOWN to instead compare against RUNNING. Reviewed-by: James Simmons Signed-off-by: NeilBrown --- net/lnet/lnet/api-ni.c | 2 +- net/lnet/lnet/peer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/lnet/lnet/api-ni.c b/net/lnet/lnet/api-ni.c index 62b4fa7..7c91800 100644 --- a/net/lnet/lnet/api-ni.c +++ b/net/lnet/lnet/api-ni.c @@ -309,7 +309,7 @@ static int lnet_discover(struct lnet_process_id id, u32 force, * changing the value dynamically, we want to set it after * updating the peers */ - if (the_lnet.ln_state == LNET_STATE_SHUTDOWN) { + if (the_lnet.ln_state != LNET_STATE_RUNNING) { *discovery_off = value; mutex_unlock(&the_lnet.ln_api_mutex); return 0; diff --git a/net/lnet/lnet/peer.c b/net/lnet/lnet/peer.c index 5869a20..f745394 100644 --- a/net/lnet/lnet/peer.c +++ b/net/lnet/lnet/peer.c @@ -810,7 +810,7 @@ struct lnet_peer_ni * int rc; rc = -ESHUTDOWN; - if (the_lnet.ln_state == LNET_STATE_SHUTDOWN) + if (the_lnet.ln_state != LNET_STATE_RUNNING) goto done; lncpt = cfs_percpt_number(the_lnet.ln_peer_tables); @@ -1805,7 +1805,7 @@ struct lnet_peer_ni * lnet_net_lock(cpt); /* Lock has been dropped, check again for shutdown. */ - if (the_lnet.ln_state == LNET_STATE_SHUTDOWN) { + if (the_lnet.ln_state != LNET_STATE_RUNNING) { if (!IS_ERR(lpni)) lnet_peer_ni_decref_locked(lpni); lpni = ERR_PTR(-ESHUTDOWN); @@ -2816,7 +2816,7 @@ static int lnet_peer_data_present(struct lnet_peer *lp) * LNET_LOCK_EX mode is used. */ mutex_lock(&the_lnet.ln_api_mutex); - if (the_lnet.ln_state == LNET_STATE_SHUTDOWN) { + if (the_lnet.ln_state != LNET_STATE_RUNNING) { rc = -ESHUTDOWN; goto out; }