[SSI] openssi/kernel.debug/common trackme.patch,1.1.2.2,1.1.2.3

Update of /cvsroot/ssic-linux/openssi/kernel.debug/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25898/common

Modified Files:
      Tag: OPENSSI-RH
        trackme.patch 
Log Message:
M openssi/kernel.debug/common/trackme.patch
        Updated patch to apply with thread-migration changes.


Index: trackme.patch
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel.debug/common/Attic/trackme.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- trackme.patch       21 May 2004 22:10:08 -0000      1.1.2.2
+++ trackme.patch       25 Jun 2004 02:58:43 -0000      1.1.2.3
@@ -180,7 +180,7 @@
 diff -Nar -U 4 o/cluster/ssi/vproc/rproc_server_pproc.c 
k/cluster/ssi/vproc/rproc_server_pproc.c
 --- o/cluster/ssi/vproc/rproc_server_pproc.c   2004-05-13 09:40:54.000000000 
-0700
 +++ k/cluster/ssi/vproc/rproc_server_pproc.c   2004-05-13 09:50:27.000000000 
-0700
-@@ -75,8 +75,10 @@
+@@ -76,8 +76,10 @@
        rf_args->retval = rfork_server(current,
                                       rf_args->childpid,
                                       rf_args->remotedata,
@@ -191,7 +191,7 @@
        if (rf_args->retval < 0) {
                /*
                 * The child process encountered an error while attempting to
-@@ -118,8 +120,10 @@
+@@ -119,8 +121,10 @@
                                         re_args->rexecve_args.argv,
                                         re_args->rexecve_args.envp,
                                         &regs,
@@ -202,18 +202,17 @@
        if (re_args->retval) {
                struct vproc *ve;
                struct pvproc *pve;
-@@ -177,8 +181,11 @@
-                                        &regs);
+@@ -182,8 +186,10 @@
+       else {
+               error = PTR_ERR(d);
+               d = NULL;
+       }
++      if (mi_args->remotedata->rd_common_data->comm_flags & PF_TRACKME)
++              proc_log("migrates", p->pid, error, 0, 0, 0);
  
-       error = update_move_state(header, mi_args->retval); 
+       free_ics_remotedata(mi_args);
  
-+      if (mi_args->remotedata->rd_common_data->comm_flags & PF_TRACKME)
-+              proc_log("migrates", current->pid, error, 0, 0, 0);
-+
-       /* cleanup migrate-in structures */
-       ent = find_move_data(header, current->pid, 0);
-       if (ent)
-               atomic_dec(&ent->m_refcnt);
+       error = move_update_state(h, d, error);
 diff -Nar -U 4 o/include/linux/sched.h k/include/linux/sched.h
 --- o/include/linux/sched.h    2004-05-13 09:40:54.000000000 -0700
 +++ k/include/linux/sched.h    2004-05-13 09:33:38.000000000 -0700



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com