[PVFS2-CVS] commit by slang in pvfs2/src/server: final-response.sm small-io.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb:/tmp/cvs-serv15917/src/server

Modified Files:
	final-response.sm small-io.sm 
Log Message:
fix for the read request size being sent in small_io operation.  The displayed error this fixes is:  pint_request.c line 89: PINT_process_request: NULL segmax or bytemax!



Index: final-response.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/final-response.sm,v
diff -p -u -r1.27 -r1.28
--- final-response.sm	11 Nov 2005 21:31:09 -0000	1.27
+++ final-response.sm	9 Jan 2006 21:59:34 -0000	1.28
@@ -210,7 +210,8 @@ static __req_resp_type_desc_t s_req_resp
     { PVFS_SERV_GETEATTR, "PVFS_SERV_GETEATTR" },
     { PVFS_SERV_SETEATTR, "PVFS_SERV_SETEATTR" },
     { PVFS_SERV_DELEATTR, "PVFS_SERV_DELEATTR" },
-    { PVFS_SERV_LISTEATTR, "PVFS_SERV_LISTEATTR" }
+    { PVFS_SERV_LISTEATTR, "PVFS_SERV_LISTEATTR" },
+    { PVFS_SERV_SMALL_IO, "PVFS_SERV_SMALL_IO" }
 };
 
 static void PINT_gossip_err_server_resp(

Index: small-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/small-io.sm,v
diff -p -u -r1.6 -r1.7
--- small-io.sm	6 Jan 2006 17:12:19 -0000	1.6
+++ small-io.sm	9 Jan 2006 21:59:35 -0000	1.7
@@ -19,9 +19,7 @@
 #include "pint-request.h"
 
 static int small_io_start_job(PINT_server_op *s_op, job_status_s *js_p);
-static int small_io_send_response(PINT_server_op *s_op, job_status_s *js_p);
 static int small_io_cleanup(PINT_server_op *s_op, job_status_s *js_p);
-static int small_io_release(PINT_server_op *s_op, job_status_s *js_p);
 
 %%
 
@@ -36,25 +34,18 @@ machine pvfs2_small_io_sm(
     {
 	jump pvfs2_prelude_sm;
 	success => start_job;
-	default => cleanup;
+	default => send_response;
     }
 
     state start_job 
     {
         run small_io_start_job;
-	success => send_response;
-        default => cleanup;
+        default => send_response;
     }
 
     state send_response
     {
-        run small_io_send_response;
-        default => release;
-    }
-    
-    state release
-    {
-        run small_io_release;
+        jump pvfs2_final_response_sm;
         default => cleanup;
     }
 
@@ -222,47 +213,6 @@ static int small_io_start_job(PINT_serve
     PINT_free_request_state(file_req_state);
 
     js_p->error_code = 0;
-    return ret;
-}
-
-static int small_io_send_response(PINT_server_op *s_op, job_status_s *js_p)
-{
-    /* trove I/O has completed, so we can send the response */
-    int err;
-    job_id_t tmp_id;
-    struct server_configuration_s * server_config;
-
-    s_op->resp.status = js_p->error_code;
-
-    server_config = get_server_config_struct();
-    err = PINT_encode(&s_op->resp, PINT_ENCODE_RESP, &(s_op->encoded),
-                      s_op->addr, s_op->decoded.enc_type);
-    if(err < 0)
-    {
-        gossip_lerr("small_io: PINT_encode() failure.\n");
-        js_p->error_code = err;
-        return 1;
-    }
-    
-    err = job_bmi_send_list(
-        s_op->addr, s_op->encoded.buffer_list, s_op->encoded.size_list,
-        s_op->encoded.list_count, s_op->encoded.total_size,
-        s_op->tag, s_op->encoded.buffer_type, 0, s_op, 0, js_p,
-        &tmp_id, server_job_context, server_config->server_job_bmi_timeout);
-
-    return err;
-}
-
-static int small_io_release(PINT_server_op *s_op, job_status_s *js_p)
-{
-    int ret = 0;
-    job_id_t i;
-    if(s_op->scheduled_id)
-    {
-        ret = job_req_sched_release(
-            s_op->scheduled_id, s_op, 0, js_p, &i, server_job_context);
-    }
-    PINT_encode_release(&s_op->encoded, PINT_ENCODE_RESP);
     return ret;
 }