[XFRM]: In xfrm_lookup(), schedule() before retrying template resolution.

aa0d8c97 · Krishna Kumar · David S. Miller · 83b79378 · aa0d8c97
Commit aa0d8c97 authored Jan 13, 2004 by Krishna Kumar Committed by David S. Miller Jan 13, 2004
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

net/xfrm/xfrm_policy.c net/xfrm/xfrm_policy.c +7 -10

No files found.
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -775,20 +775,17 @@ int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
 		if (unlikely(nx<0)) {
 			err = nx;
-			if (err == -EAGAIN) {
+			if (err == -EAGAIN && !flags) {
-				struct task_struct *tsk = current;
+				DECLARE_WAITQUEUE(wait, current);
-				DECLARE_WAITQUEUE(wait, tsk);
-				if (!flags)
-					goto error;
-				__set_task_state(tsk, TASK_INTERRUPTIBLE);
 				add_wait_queue(&km_waitq, &wait);
-				nx = xfrm_tmpl_resolve(policy, fl, xfrm, family);
+				set_current_state(TASK_INTERRUPTIBLE);
-				if (nx == -EAGAIN)
 				schedule();
-				__set_task_state(tsk, TASK_RUNNING);
+				set_current_state(TASK_RUNNING);
 				remove_wait_queue(&km_waitq, &wait);
+				nx = xfrm_tmpl_resolve(policy, fl, xfrm, family);
 				if (nx == -EAGAIN && signal_pending(current)) {
 					err = -ERESTART;
 					goto error;