]> git.hungrycats.org Git - linux/commitdiff
gfs2: Remove ill-placed consistency check
authorAndreas Gruenbacher <agruenba@redhat.com>
Wed, 10 Apr 2024 02:24:56 +0000 (04:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2024 07:49:14 +0000 (09:49 +0200)
[ Upstream commit 59f60005797b4018d7b46620037e0c53d690795e ]

This consistency check was originally added by commit 9287c6452d2b1
("gfs2: Fix occasional glock use-after-free").  It is ill-placed in
gfs2_glock_free() because if it holds there, it must equally hold in
__gfs2_glock_put() already.  Either way, the check doesn't seem
necessary anymore.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Stable-dep-of: d98779e68772 ("gfs2: Fix potential glock use-after-free on unmount")
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/gfs2/glock.c

index 385561cd4f4c739c8a4f0b9cd63618ffbaf8c0f9..5d5b3235d4e591ee6fb7d1eff50ce8c22baaf055 100644 (file)
@@ -170,7 +170,6 @@ void gfs2_glock_free(struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
 
-       gfs2_glock_assert_withdraw(gl, atomic_read(&gl->gl_revokes) == 0);
        rhashtable_remove_fast(&gl_hash_table, &gl->gl_node, ht_parms);
        smp_mb();
        wake_up_glock(gl);