- do_wait-factor-out-retval-=-0-checks.patch removed from -mm tree

[akpm]

The patch titled
     do_wait: factor out "retval != 0" checks
has been removed from the -mm tree.  Its filename was
     do_wait-factor-out-retval-=-0-checks.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: do_wait: factor out "retval != 0" checks
From: Oleg Nesterov <[EMAIL PROTECTED]>

Every branch if the main "if" statement does the same code at the end.  Move
it down.  Also, fix the indentation.

Signed-off-by: Oleg Nesterov <[EMAIL PROTECTED]>
Cc: Roland McGrath <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 kernel/exit.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff -puN kernel/exit.c~do_wait-factor-out-retval-=-0-checks kernel/exit.c
--- a/kernel/exit.c~do_wait-factor-out-retval-=-0-checks
+++ a/kernel/exit.c
@@ -1511,6 +1511,7 @@ repeat:
                        }
                        allowed = 1;
 
+                       retval = 0;
                        if (task_is_stopped_or_traced(p)) {
                                /*
                                 * It's stopped now, so it might later
@@ -1524,8 +1525,6 @@ repeat:
                                retval = wait_task_stopped(p, ret == 2,
                                                (options & WNOWAIT), infop,
                                                stat_addr, ru);
-                               if (retval != 0) /* He released the lock.  */
-                                       goto end;
                        } else if (p->exit_state == EXIT_ZOMBIE) {
                                /*
                                 * Eligible but we cannot release it yet:
@@ -1537,9 +1536,6 @@ repeat:
                                retval = wait_task_zombie(p,
                                                (options & WNOWAIT), infop,
                                                stat_addr, ru);
-                               /* He released the lock.  */
-                               if (retval != 0)
-                                       goto end;
                        } else if (p->exit_state != EXIT_DEAD) {
 check_continued:
                                /*
@@ -1552,9 +1548,9 @@ check_continued:
                                retval = wait_task_continued(p,
                                                (options & WNOWAIT), infop,
                                                stat_addr, ru);
-                               if (retval != 0) /* He released the lock.  */
-                                       goto end;
                        }
+                       if (retval != 0) /* tasklist_lock released */
+                               goto end;
                }
                if (!flag) {
                        list_for_each_entry(p, &tsk->ptrace_children,
@@ -1590,7 +1586,7 @@ end:
        remove_wait_queue(&current->signal->wait_chldexit,&wait);
        if (infop) {
                if (retval > 0)
-               retval = 0;
+                       retval = 0;
                else {
                        /*
                         * For a WNOHANG return, clear out all the fields
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
revert-proc-fix-the-threaded-proc-self.patch
procfs-task-exe-symlink.patch
procfs-task-exe-symlink-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html