gfs2: Fix GLF_INVALIDATE_IN_PROGRESS flag clearing in do_xmote

Andreas Gruenbacher · Andreas Gruenbacher · commit 625be2b5fe8f · 2025-09-24T13:11:01.000+02:00
JIRA: https://issues.redhat.com/browse/RHEL-116886 Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git Commit 865cc3e ("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: 865cc3e ("gfs2: fix a deadlock on withdraw-during-mount") Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> (cherry picked from commit 061df28)
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
@@ -798,8 +798,6 @@ __acquires(&gl->gl_lockref.lock)
 			gl->gl_lockref.count++;
 			gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD);
 			return;
-		} else {
-			clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -798,8 +798,6 @@ __acquires(&gl->gl_lockref.lock)`
`798`	`798`	`gl->gl_lockref.count++;`
`799`	`799`	`gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD);`
`800`	`800`	`return;`
`801`		`- } else {`
`802`		`- clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);`
`803`	`801`	`}`
`804`	`802`	`}`
`805`	`803`