From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01ACD16419; Mon, 23 Jun 2025 13:41:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750686102; cv=none; b=cFElGwZ3TKdMcUoa5xMEofZXbIN+j9+LtmQhmJwGT2n94zALWPks1NmUS2KbEw2LSwABm+VeajYUy79VgFi4UAPY6xtq5YZIcInLjMBAYGwuoNdCVbSOVRXdxLVCrJ52WEdtvqDidf4B4gKEdxJSk01rSY+EPPE7sq+MTytUt34= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750686102; c=relaxed/simple; bh=lNcxl71+nyvlPN99H6cWtT6CuZm3Oz1PKYgY4qAliDU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mwco7CUaWfApq25/w4EJ6e5GM+T92frRpLT00GtYN5V/w5ntneqyscWR9G1ZQHi/9NKct626eoLz3cYNbx0Xh30SgB5jHA6EwH1Sa+3qAukYCvIR1sVIB+CjSJYb/dJ85tLyTMjmytq5o/jVeud+RGcNyFAPEDc8u30If4X+I4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=i7d7sBwo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="i7d7sBwo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88256C4CEEA; Mon, 23 Jun 2025 13:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750686101; bh=lNcxl71+nyvlPN99H6cWtT6CuZm3Oz1PKYgY4qAliDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i7d7sBwoxktkKJCOFCxZncZSGQx/oiptovRytA4QCZpf2jd9gcjM84GOMXihfT1zq 0MiJ6MTei1h4HpWWSO0qxi3tyHg6to9DasjMJmATnOT4/ukvVq9Sbg5dAR0aRmmeZq V6cvtq2BTx7oFHTm4aDp8zsen/VMZVa8A/5hCv4M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andreas Gruenbacher , Alexander Aring Subject: [PATCH 6.12 003/414] gfs2: move msleep to sleepable context Date: Mon, 23 Jun 2025 15:02:20 +0200 Message-ID: <20250623130642.107014248@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Aring commit ac5ee087d31ed93b6e45d2968a66828c6f621d8c upstream. This patch moves the msleep_interruptible() out of the non-sleepable context by moving the ls->ls_recover_spin spinlock around so msleep_interruptible() will be called in a sleepable context. Cc: stable@vger.kernel.org Fixes: 4a7727725dc7 ("GFS2: Fix recovery issues for spectators") Suggested-by: Andreas Gruenbacher Signed-off-by: Alexander Aring Signed-off-by: Andreas Gruenbacher Signed-off-by: Greg Kroah-Hartman --- fs/gfs2/lock_dlm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c @@ -975,14 +975,15 @@ locks_done: if (sdp->sd_args.ar_spectator) { fs_info(sdp, "Recovery is required. Waiting for a " "non-spectator to mount.\n"); + spin_unlock(&ls->ls_recover_spin); msleep_interruptible(1000); } else { fs_info(sdp, "control_mount wait1 block %u start %u " "mount %u lvb %u flags %lx\n", block_gen, start_gen, mount_gen, lvb_gen, ls->ls_recover_flags); + spin_unlock(&ls->ls_recover_spin); } - spin_unlock(&ls->ls_recover_spin); goto restart; }