From: NeilBrown <neilb@suse.com>
Date: Tue, 1 Oct 2019 18:28:39 +0000 (-0400)
Subject: LU-10467 llite: use wait_event in cl_object_put_last()
X-Git-Tag: 2.13.51~174
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f963f19c94b547a3ae11a0caf249c53b4426456c;p=fs%2Flustre-release.git

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 <neilb@suse.com>
Reviewed-on: https://review.whamcloud.com/36345
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Shaun Tancheff <stancheff@cray.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Petros Koutoupis <pkoutoupis@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

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);