Skip to content

Commit c6bb4b3

Browse files
committed
gfs2: Use mod_delayed_work in gfs2_queue_try_to_evict
jira LE-3201 Rebuild_History Non-Buildable kernel-rt-4.18.0-553.27.1.rt7.368.el8_10 commit-author Andreas Gruenbacher <[email protected]> commit f6ca45e 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 <[email protected]> (cherry picked from commit f6ca45e) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 8ef2766 commit c6bb4b3

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

fs/gfs2/glock.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,8 +973,7 @@ bool gfs2_queue_try_to_evict(struct gfs2_glock *gl)
973973

974974
if (test_and_set_bit(GLF_TRY_TO_EVICT, &gl->gl_flags))
975975
return false;
976-
return queue_delayed_work(sdp->sd_delete_wq,
977-
&gl->gl_delete, 0);
976+
return !mod_delayed_work(sdp->sd_delete_wq, &gl->gl_delete, 0);
978977
}
979978

980979
static bool gfs2_queue_verify_delete(struct gfs2_glock *gl)

0 commit comments

Comments
 (0)