gfs2: Use mod_delayed_work in gfs2_queue_try_to_evict

Andreas Gruenbacher · Andreas Gruenbacher · commit f6ca45e3d2b9 · 2024-11-05T12:39:29.000+01:00
In the unlikely case that we're trying to queue GLF_TRY_TO_EVICT work
for an inode that already has GLF_VERIFY_DELETE work queued, we want to
make sure that the GLF_TRY_TO_EVICT work gets scheduled immediately
instead of waiting for the delayed work timer to expire.

Signed-off-by: Andreas Gruenbacher &lt;agruenba@redhat.com&gt;
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
@@ -1008,8 +1008,7 @@ bool gfs2_queue_try_to_evict(struct gfs2_glock *gl)
 
 	if (test_and_set_bit(GLF_TRY_TO_EVICT, &gl->gl_flags))
 		return false;
-	return queue_delayed_work(sdp->sd_delete_wq,
-				  &gl->gl_delete, 0);
+	return !mod_delayed_work(sdp->sd_delete_wq, &gl->gl_delete, 0);
 }
 
 bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later)

Original file line number	Diff line number	Diff line change
`@@ -1008,8 +1008,7 @@ bool gfs2_queue_try_to_evict(struct gfs2_glock *gl)`
`1008`	`1008`
`1009`	`1009`	`if (test_and_set_bit(GLF_TRY_TO_EVICT, &gl->gl_flags))`
`1010`	`1010`	`return false;`
`1011`		`- return queue_delayed_work(sdp->sd_delete_wq,`
`1012`		`- &gl->gl_delete, 0);`
	`1011`	`+ return !mod_delayed_work(sdp->sd_delete_wq, &gl->gl_delete, 0);`
`1013`	`1012`	`}`
`1014`	`1013`
`1015`	`1014`	`bool gfs2_queue_verify_delete(struct gfs2_glock *gl, bool later)`