gfs2: gfs2_glock_hold cleanup

Andreas Gruenbacher · Andreas Gruenbacher · commit d3b39fcb3957 · 2026-01-26T14:28:18.000+01:00
Use lockref_get_not_dead() instead of an unguarded __lockref_is_dead()
check.

Signed-off-by: Andreas Gruenbacher &lt;agruenba@redhat.com&gt;
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ static void gfs2_free_dead_glocks(struct gfs2_sbd *sdp)`
`185`	`185`
`186`	`186`	`struct gfs2_glock gfs2_glock_hold(struct gfs2_glock gl)`
`187`	`187`	`{`
`188`		`- GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));`
`189`		`- lockref_get(&gl->gl_lockref);`
	`188`	`+ if (!lockref_get_not_dead(&gl->gl_lockref))`
	`189`	`+ GLOCK_BUG_ON(gl, 1);`
`190`	`190`	`return gl;`
`191`	`191`	`}`
`192`	`192`