gfs2: Get rid of unnecessary test_and_set_bit

Andreas Gruenbacher · Andreas Gruenbacher · commit 262ee3a07e98 · 2024-04-09T18:35:58.000+02:00
The GLF_LOCK flag is protected by the gl-&gt;gl_lockref.lock spin lock
which is held when entering run_queue(), so we can use test_bit() and
set_bit() here.

Signed-off-by: Andreas Gruenbacher &lt;agruenba@redhat.com&gt;
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
@@ -842,8 +842,9 @@ __acquires(&gl->gl_lockref.lock)
 {
 	struct gfs2_holder *gh = NULL;
 
-	if (test_and_set_bit(GLF_LOCK, &gl->gl_flags))
+	if (test_bit(GLF_LOCK, &gl->gl_flags))
 		return;
+	set_bit(GLF_LOCK, &gl->gl_flags);
 
 	GLOCK_BUG_ON(gl, test_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags));
 

Original file line number	Diff line number	Diff line change
`@@ -842,8 +842,9 @@ __acquires(&gl->gl_lockref.lock)`
`842`	`842`	`{`
`843`	`843`	`struct gfs2_holder *gh = NULL;`
`844`	`844`
`845`		`- if (test_and_set_bit(GLF_LOCK, &gl->gl_flags))`
	`845`	`+ if (test_bit(GLF_LOCK, &gl->gl_flags))`
`846`	`846`	`return;`
	`847`	`+ set_bit(GLF_LOCK, &gl->gl_flags);`
`847`	`848`
`848`	`849`	`GLOCK_BUG_ON(gl, test_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags));`
`849`	`850`