[PATCH 5/5] schedule() bug in xfrm_lookup()

[Krishna Kumar <krkumar@xxxxxxxxxx>]

When xfrm_tmpl_resolve fails, schedule() before retrying. Also, cleaned
up the set_task_* routines to use set_current_*, etc.

This needs to be applied after [PATCH 3/5].

thanks,

- KK

diff -ruN linux-2.6.0-rc2-bk6.org/net/xfrm/xfrm_policy.c 
linux-2.6.0-rc2-bk6/net/xfrm/xfrm_policy.c
--- linux-2.6.0-rc2-bk6.org/net/xfrm/xfrm_policy.c      2004-01-09 
12:42:53.000000000 -0800
+++ linux-2.6.0-rc2-bk6/net/xfrm/xfrm_policy.c  2004-01-12 09:55:26.000000000 
-0800
@@ -775,20 +775,17 @@

                if (unlikely(nx<0)) {
                        err = nx;
-                       if (err == -EAGAIN) {
-                               struct task_struct *tsk = current;
-                               DECLARE_WAITQUEUE(wait, tsk);
-                               if (!flags)
-                                       goto error;
+                       if (err == -EAGAIN && !flags) {
+                               DECLARE_WAITQUEUE(wait, current);

-                               __set_task_state(tsk, TASK_INTERRUPTIBLE);
                                add_wait_queue(&km_waitq, &wait);
-                               nx = xfrm_tmpl_resolve(policy, fl, xfrm, 
family);
-                               if (nx == -EAGAIN)
-                                       schedule();
-                               __set_task_state(tsk, TASK_RUNNING);
+                               set_current_state(TASK_INTERRUPTIBLE);
+                               schedule();
+                               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;