[Pvfs2-cvs] commit by mtmoore in pvfs2/src/server: create-immutable-copies.sm get-eattr.sm mirror.sm prelude.sm tree-communicate.sm

CVS commit program cvs at parl.clemson.edu
Wed Jun 8 14:33:01 EDT 2011


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

Modified Files:
      Tag: Orange-Branch
	create-immutable-copies.sm get-eattr.sm mirror.sm prelude.sm 
	tree-communicate.sm 
Log Message:
compiler warning cleanup


Index: create-immutable-copies.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/Attic/create-immutable-copies.sm,v
diff -p -u -r1.1.2.6 -r1.1.2.7
--- create-immutable-copies.sm	31 Aug 2010 19:05:31 -0000	1.1.2.6
+++ create-immutable-copies.sm	8 Jun 2011 18:33:01 -0000	1.1.2.7
@@ -383,7 +383,7 @@ static PINT_sm_action inspect_source_inf
    char server_name[SERVER_NAME_MAX] = {0};
    server_configuration_s *config = get_server_config_struct();
    int ret = 0;
-   int i,j;
+   int i;
 
    /*check error codes from previous trove read-list call. */
    for (i=0; i<sm_p->keyval_count; i++)
@@ -606,7 +606,7 @@ static PINT_sm_action inspect_source_inf
       
    gossip_debug(GOSSIP_MIRROR_DEBUG,"\timm_p->io_servers_required : %d\n"
                                    ,imm_p->io_servers_required);
-   for (i=0,j=0; i<imm_p->io_servers_required; i++)
+   for (i=0; i<imm_p->io_servers_required; i++)
    {
       char *server_name = imm_p->io_servers[i];
       if (strncmp(server_name,config->host_id,SERVER_NAME_MAX-1) == 0)

Index: get-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-eattr.sm,v
diff -p -u -r1.21.10.1 -r1.21.10.2
--- get-eattr.sm	25 Feb 2011 22:20:48 -0000	1.21.10.1
+++ get-eattr.sm	8 Jun 2011 18:33:01 -0000	1.21.10.2
@@ -78,7 +78,7 @@ static PINT_sm_action geteattr_setup_res
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    int i, tsz;
+    int i;
 
     gossip_debug(GOSSIP_GETEATTR_DEBUG,"geteattr requesting %d keys\n",
             s_op->req->u.geteattr.nkey);
@@ -132,7 +132,7 @@ static PINT_sm_action geteattr_setup_res
         return SM_ACTION_COMPLETE;
     }
     s_op->resp.u.geteattr.nkey = s_op->req->u.geteattr.nkey;
-    for (i = 0, tsz = 0; i < s_op->req->u.geteattr.nkey; i++)
+    for (i = 0; i < s_op->req->u.geteattr.nkey; i++)
     {
         s_op->resp.u.geteattr.val[i].buffer = malloc(
             s_op->req->u.geteattr.valsz[i]);

Index: mirror.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/Attic/mirror.sm,v
diff -p -u -r1.1.2.1 -r1.1.2.2
--- mirror.sm	30 Apr 2009 15:24:45 -0000	1.1.2.1
+++ mirror.sm	8 Jun 2011 18:33:01 -0000	1.1.2.2
@@ -702,6 +702,11 @@ static PINT_sm_action check_comm ( struc
 
    server_config = get_server_config_struct();
    cur_fs = PINT_config_find_fs_id(server_config,reqmir_p->fs_id);
+  
+   if( cur_fs == NULL )
+   {
+      return -PVFS_EINVAL;
+   }
 
    /*status_user_tag's will only exist for those destination handles that had */
    /*successful posts of a write-ack and flow.                                */

Index: prelude.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/prelude.sm,v
diff -p -u -r1.75.10.5 -r1.75.10.6
--- prelude.sm	6 May 2011 17:36:20 -0000	1.75.10.5
+++ prelude.sm	8 Jun 2011 18:33:01 -0000	1.75.10.6
@@ -92,6 +92,10 @@ static PINT_sm_action prelude_setup(
 
     ret = PINT_server_req_get_object_ref(
         s_op->req, &s_op->target_fs_id, &s_op->target_handle);
+    if( ret != 0 )
+    {
+        js_p->error_code = -PVFS_EINVAL;
+    }
     s_op->access_type = PINT_server_req_get_access_type(s_op->req);
     s_op->sched_policy = PINT_server_req_get_sched_policy(s_op->req);
 

Index: tree-communicate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/Attic/tree-communicate.sm,v
diff -p -u -r1.1.6.10 -r1.1.6.11
--- tree-communicate.sm	15 Dec 2010 21:11:17 -0000	1.1.6.10
+++ tree-communicate.sm	8 Jun 2011 18:33:01 -0000	1.1.6.11
@@ -577,7 +577,6 @@ static int tree_get_file_size_work_clean
     int i, j, k, task_id, error_code;
     uint32_t size_array_index=0, error_array_index=0;
     PINT_server_op *old_frame;
-    struct PVFS_servresp_tree_get_file_size *tree_resp = NULL;
     struct PVFS_servreq_tree_get_file_size *tree_req = NULL;
     PINT_sm_msgpair_state *tree_msgarray = NULL;
     PINT_sm_msgarray_op *tree_msgop = NULL;
@@ -595,9 +594,7 @@ static int tree_get_file_size_work_clean
     {
         old_frame = PINT_sm_pop_frame(smcb, &task_id, &error_code, NULL);
         if (old_frame)
-        {  /* response from sub-tree request */
-           tree_resp = &(old_frame->resp.u.tree_get_file_size);
-
+        {  
            /* sub-tree msgpair array*/
            tree_msgarray  = old_frame->msgarray_op.msgarray;
 



More information about the Pvfs2-cvs mailing list