On Tue, Apr 1, 2025 at 1:03 AM Alexander Aring aahringo@redhat.com wrote:

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 agruenba@redhat.com Signed-off-by: Alexander Aring aahringo@redhat.com

---

changes since v2:

• move the spinlock around to avoid schedule under spinlock

fs/gfs2/lock_dlm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index 58aeeae7ed8c..2c9172dd41e7 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c @@ -996,14 +996,15 @@ static int control_mount(struct gfs2_sbd *sdp) 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;
    }
  
  

-- 2.43.0

Pushed to for-next, thanks.

Andreas