From patchwork Mon Sep 30 18:54:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11167071 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 53B2B13BD for ; Mon, 30 Sep 2019 18:57:50 +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 3BF07224F0 for ; Mon, 30 Sep 2019 18:57:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BF07224F0 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 172EE5C356A; Mon, 30 Sep 2019 11:57:27 -0700 (PDT) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp4.ccs.ornl.gov (smtp4.ccs.ornl.gov [160.91.203.40]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id CC6945C39AE for ; Mon, 30 Sep 2019 11:57:05 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp4.ccs.ornl.gov (Postfix) with ESMTP id 6E07E1005407; Mon, 30 Sep 2019 14:56:56 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 6D0CBA9; Mon, 30 Sep 2019 14:56:56 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 30 Sep 2019 14:54:43 -0400 Message-Id: <1569869810-23848-25-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1569869810-23848-1-git-send-email-jsimmons@infradead.org> References: <1569869810-23848-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 024/151] lnet: Fix lost lock 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: Dmitry Eremin Unlock lnet_net_lock in case of error in function lnet_dyn_del_net(). WC-bug-id: https://jira.whamcloud.com/browse/LU-9769 Lustre-commit: 9761b5c63103 ("LU-9769 lnet: Fix lost lock") Signed-off-by: Dmitry Eremin Reviewed-on: https://review.whamcloud.com/28039 Reviewed-by: Amir Shehata Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Signed-off-by: James Simmons --- net/lnet/lnet/api-ni.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/lnet/lnet/api-ni.c b/net/lnet/lnet/api-ni.c index c33cd1f..47f4f2a 100644 --- a/net/lnet/lnet/api-ni.c +++ b/net/lnet/lnet/api-ni.c @@ -2906,6 +2906,7 @@ int lnet_dyn_del_ni(struct lnet_ioctl_config_ni *conf) net = lnet_get_net_locked(net_id); if (!net) { + lnet_net_unlock(0); rc = -EINVAL; goto out; }