From: Andreas Gruenbacher Date: Fri, 13 Sep 2024 20:56:53 +0000 (+0200) Subject: gfs2: Use mod_delayed_work in gfs2_queue_try_to_evict X-Git-Tag: v6.13-rc1~79^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6ca45e3d2b97ddb4bfcbbe44d1dd18374cd6f85;p=thirdparty%2Fkernel%2Flinux.git gfs2: Use mod_delayed_work in gfs2_queue_try_to_evict 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 --- diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 8fff36846145c..5455f4dd14a31 100644 --- 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)