summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2025-08-02 23:57:24 +0200
committerAndreas Gruenbacher <agruenba@redhat.com>2025-09-12 12:02:38 +0200
commit061df28b82af6b22fb5fa529a8f2ef00474ee004 (patch)
treee2aa5a5cf2fac75e47826caacca3f4bad812f5a1
parent9b54770b68ae793a3a8d378be4cda2bb7be6c8cc (diff)
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>
-rw-r--r--fs/gfs2/glock.c2
1 files changed, 0 insertions, 2 deletions
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);
}
}