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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D06BC61DA4 for ; Mon, 6 Mar 2023 13:33:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231338AbjCFNdk (ORCPT ); Mon, 6 Mar 2023 08:33:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231253AbjCFNdR (ORCPT ); Mon, 6 Mar 2023 08:33:17 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFD2F2ED66 for ; Mon, 6 Mar 2023 05:32:50 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id CA2DCCE118D for ; Mon, 6 Mar 2023 13:32:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8446C433D2; Mon, 6 Mar 2023 13:32:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678109565; bh=cKAn3WrqaGkkkIydSvdXJqKUHJz/ewY0tuYGgYf6PBk=; h=Subject:To:Cc:From:Date:From; b=wyY7Mucvkv1PWvdBthNcxxA3XVkq/FrU9gtrbPZs7Q8kHcSkRLFYijeJhsFlOaejl ep4KYiiMuu5fRPhwHjR9pjg54n/2F3ri9PRDOLd7WG0tVP+NxwlFKHUWy9BhUGjwxI pgw2XJBZm2OCGeoWC6y+fZBC8B7dYcX1r8KoTViU= Subject: FAILED: patch "[PATCH] fs: dlm: start midcomms before scand" failed to apply to 4.19-stable tree To: aahringo@redhat.com, teigland@redhat.com Cc: From: Date: Mon, 06 Mar 2023 14:32:35 +0100 Message-ID: <167810955521098@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x aad633dc0cf90093998b1ae0ba9f19b5f1dab644 # git commit -s git send-email --to '' --in-reply-to '167810955521098@kroah.com' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: aad633dc0cf9 ("fs: dlm: start midcomms before scand") 3e54c9e80e68 ("fs: dlm: fix log of lowcomms vs midcomms") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From aad633dc0cf90093998b1ae0ba9f19b5f1dab644 Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Thu, 12 Jan 2023 17:10:31 -0500 Subject: [PATCH] fs: dlm: start midcomms before scand The scand kthread can send dlm messages out, especially dlm remove messages to free memory for unused rsb on other nodes. To send out dlm messages, midcomms must be initialized. This patch moves the midcomms start before scand is started. Cc: stable@vger.kernel.org Fixes: e7fd41792fc0 ("[DLM] The core of the DLM for GFS2/CLVM") Signed-off-by: Alexander Aring Signed-off-by: David Teigland diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index d0b4e2181a5f..99bc96f90779 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -381,23 +381,23 @@ static int threads_start(void) { int error; - error = dlm_scand_start(); + /* Thread for sending/receiving messages for all lockspace's */ + error = dlm_midcomms_start(); if (error) { - log_print("cannot start dlm_scand thread %d", error); + log_print("cannot start dlm midcomms %d", error); goto fail; } - /* Thread for sending/receiving messages for all lockspace's */ - error = dlm_midcomms_start(); + error = dlm_scand_start(); if (error) { - log_print("cannot start dlm midcomms %d", error); - goto scand_fail; + log_print("cannot start dlm_scand thread %d", error); + goto midcomms_fail; } return 0; - scand_fail: - dlm_scand_stop(); + midcomms_fail: + dlm_midcomms_stop(); fail: return error; }