summaryrefslogtreecommitdiff
path: root/fs/gfs2
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2025-08-02 23:57:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-15 11:57:48 +0200
commit239c49a99d635cc24962b433b8dab7fe1d0abd70 (patch)
tree942071832d3644eefeb3fc8d731314aef2c2205c /fs/gfs2
parent69e2a7c307501a26d825a962e8eb5bd25e013424 (diff)
downloadlinux-239c49a99d635cc24962b433b8dab7fe1d0abd70.tar.gz
linux-239c49a99d635cc24962b433b8dab7fe1d0abd70.tar.bz2
linux-239c49a99d635cc24962b433b8dab7fe1d0abd70.zip
gfs2: Fix GLF_INVALIDATE_IN_PROGRESS flag clearing in do_xmote
[ Upstream commit 061df28b82af6b22fb5fa529a8f2ef00474ee004 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/gfs2')
-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 687670075d22..c4bc86c3535b 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -811,8 +811,6 @@ skip_inval:
clear_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags);
gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD);
return;
- } else {
- clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);
}
}