From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Sat, 2 Aug 2025 21:57:24 +0000 (+0200)
Subject: gfs2: Fix GLF_INVALIDATE_IN_PROGRESS flag clearing in do_xmote
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=061df28b82af6b22fb5fa529a8f2ef00474ee004;p=users%2Fhch%2Fmisc.git

gfs2: Fix GLF_INVALIDATE_IN_PROGRESS flag clearing in do_xmote

Commit 865cc3e9cc0b ("gfs2: fix a deadlock on withdraw-during-mount")
added a statement to do_xmote() to clear the GLF_INVALIDATE_IN_PROGRESS
flag a second time after it has already been cleared.  Fix that.

Fixes: 865cc3e9cc0b ("gfs2: fix a deadlock on withdraw-during-mount")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Andrew Price <anprice@redhat.com>
---

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 15a90ab8a979..5361a2641cdb 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -797,8 +797,6 @@ skip_inval:
 			gl->gl_lockref.count++;
 			gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD);
 			return;
-		} else {
-			clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);
 		}
 	}