[Pvfs2-cvs] commit by dbonnie in pvfs2/src/client/sysint: server-get-config.sm sys-getattr.sm

[CVS commit program]

Update of /anoncvs/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv5496/src/client/sysint

Modified Files:
      Tag: cu-security-branch
	server-get-config.sm sys-getattr.sm 
Log Message:
Updated patch from HEAD.


Index: server-get-config.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.31.2.1 -r1.31.2.2
--- server-get-config.sm	16 May 2008 15:15:31 -0000	1.31.2.1
+++ server-get-config.sm	16 May 2008 16:06:54 -0000	1.31.2.2
@@ -256,17 +256,19 @@ static PINT_sm_action server_get_config_
     PVFS_BMI_addr_t serv_addr;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG,
-		"get_config state: server_get_config_setup_msgpair\n");
+                 "get_config state: server_get_config_setup_msgpair\n");
+
+    PINT_msgpair_init(&sm_p->msgarray_op);
+    msg_p = &sm_p->msgarray_op.msgpair;
 
     if (ENCODING_IS_VALID(sm_p->u.get_config.mntent->encoding))
     {
-        sm_p->msgarray_op.msgpair.enc_type = sm_p->u.get_config.mntent->encoding;
+        msg_p->enc_type = sm_p->u.get_config.mntent->encoding;
     }
 
-    msg_p = &sm_p->msgarray_op.msgpair;
 
     ret = BMI_addr_lookup(&serv_addr,
-	    sm_p->u.get_config.mntent->the_pvfs_config_server);
+                          sm_p->u.get_config.mntent->the_pvfs_config_server);
     if (ret < 0)
     {
         gossip_lerr("Failed to resolve BMI address %s\n",

Index: sys-getattr.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.110.4.1 -r1.110.4.2
--- sys-getattr.sm	16 May 2008 15:15:31 -0000	1.110.4.1
+++ sys-getattr.sm	16 May 2008 16:06:54 -0000	1.110.4.2
@@ -636,7 +636,7 @@ static PINT_sm_action getattr_datafile_g
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
     struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    int ret = -PVFS_EINVAL, i = 0;
+    int ret = -PVFS_EINVAL;
     PVFS_object_attr *attr = NULL;
     PINT_sm_msgpair_state *msg_p;
     int index;
@@ -661,17 +661,17 @@ static PINT_sm_action getattr_datafile_g
 
         gossip_debug(GOSSIP_GETATTR_DEBUG,
                      "  datafile_getattr: getting size for handle %llu\n",
-                     llu(attr->u.meta.dfile_array[i]));
+                     llu(attr->u.meta.dfile_array[index]));
 
         PINT_SERVREQ_GETATTR_FILL(
             msg_p->req,
             *sm_p->cred_p,
             sm_p->getattr.object_ref.fs_id,
-            attr->u.meta.dfile_array[i],
+            attr->u.meta.dfile_array[index],
             PVFS_ATTR_DATA_SIZE);
 
         msg_p->fs_id = sm_p->getattr.object_ref.fs_id;
-        msg_p->handle = attr->u.meta.dfile_array[i];
+        msg_p->handle = attr->u.meta.dfile_array[index];
         msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
         msg_p->comp_fn = getattr_datafile_getattr_comp_fn;
     }