From f963f19c94b547a3ae11a0caf249c53b4426456c Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 1 Oct 2019 14:28:39 -0400 Subject: [PATCH] LU-10467 llite: use wait_event in cl_object_put_last() cl_object_put_last() contains an open-coded version of wait_event(). Replace it with the library macro. Change-Id: I878f76c9af24e827f91fe50fbeb637dda1489b8a Signed-off-by: NeilBrown Reviewed-on: https://review.whamcloud.com/36345 Tested-by: jenkins Reviewed-by: Neil Brown Reviewed-by: Shaun Tancheff Tested-by: Maloo Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin --- lustre/llite/lcommon_cl.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c index bc4c30a..c8e4402 100644 --- a/lustre/llite/lcommon_cl.c +++ b/lustre/llite/lcommon_cl.c @@ -211,7 +211,6 @@ out: static void cl_object_put_last(struct lu_env *env, struct cl_object *obj) { struct lu_object_header *header = obj->co_lu.lo_header; - wait_queue_entry_t waiter; if (unlikely(atomic_read(&header->loh_ref) != 1)) { struct lu_site *site = obj->co_lu.lo_dev->ld_site; @@ -219,18 +218,7 @@ static void cl_object_put_last(struct lu_env *env, struct cl_object *obj) wq = lu_site_wq_from_fid(site, &header->loh_fid); - init_waitqueue_entry(&waiter, current); - add_wait_queue(wq, &waiter); - - while (1) { - set_current_state(TASK_UNINTERRUPTIBLE); - if (atomic_read(&header->loh_ref) == 1) - break; - schedule(); - } - - set_current_state(TASK_RUNNING); - remove_wait_queue(wq, &waiter); + wait_event(*wq, atomic_read(&header->loh_ref) == 1); } cl_object_put(env, obj); -- 1.8.3.1