X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fptlrpcd.c;h=9810009f35318d6649329cf966625bc1f27f1406;hb=ca6c35cab141597809c6f3a58102fac8ac86104a;hp=5b5ef375b87034e5f901a6e1f87a32ec816cba92;hpb=5e30a2c06176f50f5e17aba68fdae7e38d922d33;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index 5b5ef37..9810009 100644
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -274,12 +274,13 @@ void ptlrpcd_add_req(struct ptlrpc_request *req)
 
 	spin_lock(&req->rq_lock);
 	if (req->rq_invalid_rqset) {
-		struct l_wait_info lwi = LWI_TIMEOUT(cfs_time_seconds(5),
-						     back_to_sleep, NULL);
-
 		req->rq_invalid_rqset = 0;
 		spin_unlock(&req->rq_lock);
-		l_wait_event(req->rq_set_waitq, (req->rq_set == NULL), &lwi);
+		if (wait_event_idle_timeout(req->rq_set_waitq,
+					    req->rq_set == NULL,
+					    cfs_time_seconds(5)) == 0)
+			l_wait_event_abortable(req->rq_set_waitq,
+					       req->rq_set == NULL);
 	} else if (req->rq_set) {
 		/*
 		 * If we have a vaid "rq_set", just reuse it to avoid double