From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Tue, 18 Nov 2025 20:19:45 +0000 (+0000)
Subject: gfs2: gfs2_glock_hold cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3b39fcb39574780fffec4357412ce0460339e9f;p=thirdparty%2Flinux.git

gfs2: gfs2_glock_hold cleanup

Use lockref_get_not_dead() instead of an unguarded __lockref_is_dead()
check.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 7c3d488327eef..bba4155119205 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -185,8 +185,8 @@ static void gfs2_free_dead_glocks(struct gfs2_sbd *sdp)
 
 struct gfs2_glock *gfs2_glock_hold(struct gfs2_glock *gl)
 {
-	GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
-	lockref_get(&gl->gl_lockref);
+	if (!lockref_get_not_dead(&gl->gl_lockref))
+		GLOCK_BUG_ON(gl, 1);
 	return gl;
 }