| From 7cdec1ddaabf85f804d65c0ff70dda7ffbc8457f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 10 Apr 2024 04:24:56 +0200 |
| Subject: gfs2: Remove ill-placed consistency check |
| |
| From: Andreas Gruenbacher <agruenba@redhat.com> |
| |
| [ 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 | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c |
| index 385561cd4f4c7..5d5b3235d4e59 100644 |
| --- a/fs/gfs2/glock.c |
| +++ b/fs/gfs2/glock.c |
| @@ -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); |
| -- |
| 2.43.0 |
| |
