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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 4D5F3C07E99 for ; Mon, 5 Jul 2021 15:36:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39AB561964 for ; Mon, 5 Jul 2021 15:36:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233183AbhGEPin (ORCPT ); Mon, 5 Jul 2021 11:38:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:36252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233398AbhGEPg7 (ORCPT ); Mon, 5 Jul 2021 11:36:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 270A1619B0; Mon, 5 Jul 2021 15:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625499132; bh=ZBG21QsAd7QPsvRSckg9NgpSZxUluXMJ24AS0Ib+BUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X4bI5b8A9B+w2P3spOO5mlhIOr+RWZOCyE2pSPiMnSpx2wDudKDFKXWOgEBNt3m9L 5oy4v7oPTxm7Rn6bv/XuffiLbOFl0JUEektgycOV3q/ZJC5OkyHHxqvv/SzgkdEjO+ jRJt97Z2se0UD+i86KfwvLk5WFlhiYSCzfL68VfJA7/8EuEGuYTlfPPyknOjWGvOwH X2Xb4157SbVE9cJl64/pifV5aNJnua4yA5t7FBhVc7F6003w3h7AnR0Oj1zq966yFX aIssYaFMb/tVGGPCOg83AAnIcBJ59Z0zlSRyPMApGi32Ssvq/cbXWlZB0Jg4Avvgoq B3AMelQxs0Qbg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Aring , David Teigland , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 4.4 3/7] fs: dlm: cancel work sync othercon Date: Mon, 5 Jul 2021 11:32:03 -0400 Message-Id: <20210705153208.1522553-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705153208.1522553-1-sashal@kernel.org> References: <20210705153208.1522553-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Aring [ Upstream commit c6aa00e3d20c2767ba3f57b64eb862572b9744b3 ] These rx tx flags arguments are for signaling close_connection() from which worker they are called. Obviously the receive worker cannot cancel itself and vice versa for swork. For the othercon the receive worker should only be used, however to avoid deadlocks we should pass the same flags as the original close_connection() was called. Signed-off-by: Alexander Aring Signed-off-by: David Teigland Signed-off-by: Sasha Levin --- fs/dlm/lowcomms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 9d7a4a714907..99f4cd91910f 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -554,7 +554,7 @@ static void close_connection(struct connection *con, bool and_other, } if (con->othercon && and_other) { /* Will only re-enter once. */ - close_connection(con->othercon, false, true, true); + close_connection(con->othercon, false, tx, rx); } if (con->rx_page) { __free_page(con->rx_page); -- 2.30.2