[Pvfs2-cvs] commit by mtmoore in pvfs2/src/server: pvfs2-server.h tree-communicate.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv1686/pvfs2/src/server

Modified Files:
      Tag: cu-security-branch
	pvfs2-server.h tree-communicate.sm 
Log Message:
change PINT_server_op variable used by tree_communicate to use a more descriptive name


Index: pvfs2-server.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.h,v
diff -p -u -r1.150.2.18 -r1.150.2.19
--- pvfs2-server.h	22 Sep 2010 06:44:00 -0000	1.150.2.18
+++ pvfs2-server.h	15 Dec 2010 21:15:57 -0000	1.150.2.19
@@ -524,6 +524,10 @@ typedef struct PINT_server_op
 
     int free_val;
 
+    /* generic int for use by state machines that are accessing
+     * PINT_server_op structs before pjumping to them. */
+    int local_index;
+
     /* attributes structure associated with target of operation; may be 
      * partially filled in by prelude nested state machine (for 
      * permission checking); may be used/modified by later states as well

Index: tree-communicate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/Attic/tree-communicate.sm,v
diff -p -u -r1.1.8.4 -r1.1.8.5
--- tree-communicate.sm	14 Dec 2010 18:06:43 -0000	1.1.8.4
+++ tree-communicate.sm	15 Dec 2010 21:15:57 -0000	1.1.8.5
@@ -239,7 +239,7 @@ static PINT_sm_action tree_communicate_p
                  * so we can't rely on a value in u.tree_communicate here.
                  * All we need is an int, I'm loathe to do a malloc instead of
                  * just re-purposing one of the existing ints in the s_op. */
-                tree_communicate_s_op->keyval_count = i;
+                tree_communicate_s_op->local_index = i;
 
                 break;
             }
@@ -662,9 +662,9 @@ static int tree_get_file_size_work_clean
                          ,lld(old_frame->resp.u.getattr.attr.u.data.size));
             gossip_debug(GOSSIP_SERVER_DEBUG,"%s:handle_index:%d\n"
                                             ,__func__
-                                            ,old_frame->keyval_count);
+                                            ,old_frame->local_index);
             size_array_index = s_op->u.tree_communicate.local_join_size[
-                                     old_frame->keyval_count];
+                                     old_frame->local_index];
             error_array_index=size_array_index;
             s_op->resp.u.tree_get_file_size.size[size_array_index]   = old_frame->resp.u.getattr.attr.u.data.size;
             s_op->resp.u.tree_get_file_size.error[error_array_index] = error_code;