Fri Aug 26 16:10:56 EDT 2005

Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv16436/src/client/sysint

Modified Files:
	client-job-timer.sm lookup-ncache.sm mgmt-create-dirent.sm 
	mgmt-event-mon-list.sm mgmt-get-dfile-array.sm 
	mgmt-get-dirdata-handle.sm mgmt-iterate-handles-list.sm 
	mgmt-noop.sm mgmt-perf-mon-list.sm mgmt-remove-dirent.sm 
	mgmt-remove-object.sm mgmt-setparam-list.sm 
	mgmt-statfs-list.sm remove.sm server-get-config.sm 
	sys-create.sm sys-del-eattr.sm sys-flush.sm sys-get-eattr.sm 
	sys-getattr.sm sys-io.sm sys-lookup.sm sys-mkdir.sm 
	sys-readdir.sm sys-remove.sm sys-rename.sm sys-set-eattr.sm 
	sys-setattr.sm sys-symlink.sm sys-truncate.sm 
Log Message:
fixed lookup failure with new acache code.  Also removed state-machine-fns.h include from client state machines to alleviate unused function warning.


Index: client-job-timer.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-job-timer.sm,v
diff -p -u -r1.3 -r1.4

--- client-job-timer.sm	29 Jul 2004 19:52:33 -0000	1.3
+++ client-job-timer.sm	26 Aug 2005 19:10:55 -0000	1.4
@@ -12,7 +12,6 @@
 #include <sys/time.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "job-time-mgr.h"
 
 extern job_context_id pint_client_sm_context;

Index: lookup-ncache.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/lookup-ncache.sm,v
diff -p -u -r1.10 -r1.11
--- lookup-ncache.sm	20 Oct 2004 14:50:19 -0000	1.10
+++ lookup-ncache.sm	26 Aug 2005 19:10:55 -0000	1.11
@@ -40,7 +40,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-create-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-create-dirent.sm,v
diff -p -u -r1.7 -r1.8
--- mgmt-create-dirent.sm	19 Jul 2005 21:12:44 -0000	1.7
+++ mgmt-create-dirent.sm	26 Aug 2005 19:10:55 -0000	1.8
@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-event-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-event-mon-list.sm,v
diff -p -u -r1.24 -r1.25
--- mgmt-event-mon-list.sm	19 Jul 2005 21:12:44 -0000	1.24
+++ mgmt-event-mon-list.sm	26 Aug 2005 19:10:55 -0000	1.25
@@ -14,7 +14,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-get-dfile-array.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-get-dfile-array.sm,v
diff -p -u -r1.23 -r1.24
--- mgmt-get-dfile-array.sm	23 Aug 2005 18:44:13 -0000	1.23
+++ mgmt-get-dfile-array.sm	26 Aug 2005 19:10:55 -0000	1.24
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"
@@ -25,6 +24,7 @@
 #include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
+#include "pint-util.h"
 
 extern job_context_id pint_client_sm_context;
 

Index: mgmt-get-dirdata-handle.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-get-dirdata-handle.sm,v
diff -p -u -r1.5 -r1.6
--- mgmt-get-dirdata-handle.sm	19 Jul 2005 21:12:45 -0000	1.5
+++ mgmt-get-dirdata-handle.sm	26 Aug 2005 19:10:55 -0000	1.6
@@ -18,7 +18,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-iterate-handles-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-iterate-handles-list.sm,v
diff -p -u -r1.23 -r1.24
--- mgmt-iterate-handles-list.sm	19 Jul 2005 21:12:45 -0000	1.23
+++ mgmt-iterate-handles-list.sm	26 Aug 2005 19:10:55 -0000	1.24
@@ -15,7 +15,6 @@
 #include <string.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-types.h"
 #include "pvfs2-mgmt.h"
 #include "server-config.h"

Index: mgmt-noop.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-noop.sm,v
diff -p -u -r1.26 -r1.27
--- mgmt-noop.sm	19 Jul 2005 21:12:45 -0000	1.26
+++ mgmt-noop.sm	26 Aug 2005 19:10:55 -0000	1.27
@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-perf-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-perf-mon-list.sm,v
diff -p -u -r1.27 -r1.28
--- mgmt-perf-mon-list.sm	19 Jul 2005 21:12:45 -0000	1.27
+++ mgmt-perf-mon-list.sm	26 Aug 2005 19:10:55 -0000	1.28
@@ -15,7 +15,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-remove-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-remove-dirent.sm,v
diff -p -u -r1.5 -r1.6
--- mgmt-remove-dirent.sm	19 Jul 2005 21:12:45 -0000	1.5
+++ mgmt-remove-dirent.sm	26 Aug 2005 19:10:55 -0000	1.6
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-remove-object.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-remove-object.sm,v
diff -p -u -r1.5 -r1.6
--- mgmt-remove-object.sm	19 Jul 2005 21:12:45 -0000	1.5
+++ mgmt-remove-object.sm	26 Aug 2005 19:10:55 -0000	1.6
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-setparam-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-setparam-list.sm,v
diff -p -u -r1.26 -r1.27
--- mgmt-setparam-list.sm	19 Jul 2005 21:12:45 -0000	1.26
+++ mgmt-setparam-list.sm	26 Aug 2005 19:10:55 -0000	1.27
@@ -18,7 +18,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: mgmt-statfs-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-statfs-list.sm,v
diff -p -u -r1.36 -r1.37
--- mgmt-statfs-list.sm	19 Jul 2005 21:12:45 -0000	1.36
+++ mgmt-statfs-list.sm	26 Aug 2005 19:10:55 -0000	1.37
@@ -15,7 +15,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/remove.sm,v
diff -p -u -r1.14 -r1.15
--- remove.sm	23 Aug 2005 18:44:13 -0000	1.14
+++ remove.sm	26 Aug 2005 19:10:55 -0000	1.15
@@ -8,7 +8,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: server-get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.18 -r1.19
--- server-get-config.sm	19 Jul 2005 21:12:45 -0000	1.18
+++ server-get-config.sm	26 Aug 2005 19:10:55 -0000	1.19
@@ -9,7 +9,6 @@
 #include <unistd.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "pvfs2-util.h"
 #include "job.h"

Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.82 -r1.83
--- sys-create.sm	23 Aug 2005 18:44:13 -0000	1.82
+++ sys-create.sm	26 Aug 2005 19:10:55 -0000	1.83
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "pvfs2-dist-simple-stripe.h"
 #include "job.h"

Index: sys-del-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-del-eattr.sm,v
diff -p -u -r1.3 -r1.4
--- sys-del-eattr.sm	1 Aug 2005 16:23:09 -0000	1.3
+++ sys-del-eattr.sm	26 Aug 2005 19:10:55 -0000	1.4
@@ -9,7 +9,6 @@
 #include <unistd.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "pvfs2-util.h"
 #include "job.h"

Index: sys-flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-flush.sm,v
diff -p -u -r1.30 -r1.31
--- sys-flush.sm	23 Aug 2005 18:44:13 -0000	1.30
+++ sys-flush.sm	26 Aug 2005 19:10:55 -0000	1.31
@@ -14,7 +14,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: sys-get-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-get-eattr.sm,v
diff -p -u -r1.2 -r1.3
--- sys-get-eattr.sm	21 Jul 2005 16:17:54 -0000	1.2
+++ sys-get-eattr.sm	26 Aug 2005 19:10:55 -0000	1.3
@@ -9,7 +9,6 @@
 #include <unistd.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "pvfs2-util.h"
 #include "job.h"

Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.82 -r1.83
--- sys-getattr.sm	23 Aug 2005 18:44:13 -0000	1.82
+++ sys-getattr.sm	26 Aug 2005 19:10:55 -0000	1.83
@@ -15,7 +15,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-types-debug.h"
 #include "pvfs2-debug.h"
 #include "job.h"
@@ -445,6 +444,7 @@ static int getattr_object_getattr_setup_
                                                 job_status_s *js_p)
 {
     int ret = -PVFS_EINVAL;
+    PVFS_object_ref object_ref;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "(%p) "
                  "getattr_setup_msgpair\n", sm_p);
@@ -453,19 +453,21 @@ static int getattr_object_getattr_setup_
 
     memset(&sm_p->msgpair, 0, sizeof(PINT_sm_msgpair_state));
 
-    assert(sm_p->object_ref.fs_id != PVFS_FS_ID_NULL);
-    assert(sm_p->object_ref.handle != PVFS_HANDLE_NULL);
+    object_ref = sm_p->getattr.object_ref;
+
+    assert(object_ref.fs_id != PVFS_FS_ID_NULL);
+    assert(object_ref.handle != PVFS_HANDLE_NULL);
 
     /* setup the msgpair to do a getattr operation */
     PINT_SERVREQ_GETATTR_FILL(
         sm_p->msgpair.req,
         *sm_p->cred_p,
-        sm_p->object_ref.fs_id,
-        sm_p->object_ref.handle,
+        object_ref.fs_id,
+        object_ref.handle,
         sm_p->getattr.req_attrmask);
     
-    sm_p->msgpair.fs_id = sm_p->object_ref.fs_id;
-    sm_p->msgpair.handle = sm_p->object_ref.handle;
+    sm_p->msgpair.fs_id = object_ref.fs_id;
+    sm_p->msgpair.handle = object_ref.handle;
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_RETRY;
     sm_p->msgpair.comp_fn = getattr_object_getattr_comp_fn;
 
@@ -673,11 +675,11 @@ static int getattr_datafile_getattr_setu
         PINT_SERVREQ_GETATTR_FILL(
             msg_p->req,
             *sm_p->cred_p,
-            sm_p->object_ref.fs_id,
+            sm_p->getattr.object_ref.fs_id,
             attr->u.meta.dfile_array[i],
             PVFS_ATTR_DATA_SIZE);
 
-        msg_p->fs_id = sm_p->object_ref.fs_id;
+        msg_p->fs_id = sm_p->getattr.object_ref.fs_id;
         msg_p->handle = attr->u.meta.dfile_array[i];
         msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
         msg_p->comp_fn = getattr_datafile_getattr_comp_fn;
@@ -729,7 +731,7 @@ static int getattr_acache_insert(PINT_cl
     PVFS_object_attr *attr = NULL;
     int release_required = 1;
     PINT_pinode *pinode = PINT_acache_lookup(
-        sm_p->object_ref, NULL, NULL);
+        sm_p->getattr.object_ref, NULL, NULL);
     if (!pinode)
     {
         pinode = PINT_acache_pinode_alloc();

Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.121 -r1.122
--- sys-io.sm	23 Aug 2005 18:44:13 -0000	1.121
+++ sys-io.sm	26 Aug 2005 19:10:56 -0000	1.122
@@ -14,7 +14,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-types-debug.h"
 #include "pvfs2-debug.h"
 #include "job.h"

Index: sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.56 -r1.57
--- sys-lookup.sm	23 Aug 2005 18:44:13 -0000	1.56
+++ sys-lookup.sm	26 Aug 2005 19:10:56 -0000	1.57
@@ -14,7 +14,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"
@@ -27,14 +26,14 @@
 
 extern job_context_id pint_client_sm_context;
 
-#define GET_SEGMENT_AT(index)                                            \
-&(sm_p->u.lookup.contexts[sm_p->u.lookup.current_context].segments[      \
-index])
-#define GET_CURRENT_SEGMENT()                                            \
-&(sm_p->u.lookup.contexts[sm_p->u.lookup.current_context].segments[      \
-sm_p->u.lookup.contexts[sm_p->u.lookup.current_context].current_segment])
-#define GET_CURRENT_CONTEXT()                                            \
-&(sm_p->u.lookup.contexts[sm_p->u.lookup.current_context])
+#define GET_CURRENT_CONTEXT(__sm_p)                                          \
+(&(__sm_p->u.lookup.contexts[__sm_p->u.lookup.current_context]))
+
+#define GET_SEGMENT_AT(__sm_p, index)                                        \
+(&((GET_CURRENT_CONTEXT(__sm_p))->segments[index]))
+
+#define GET_CURRENT_SEGMENT(__sm_p)                                          \
+(GET_SEGMENT_AT(__sm_p, (GET_CURRENT_CONTEXT(__sm_p))->current_segment))
 
 enum
 {
@@ -616,7 +615,7 @@ static int lookup_segment_lookup_setup_m
     js_p->error_code = 0;
 
     /* do a lookup on the current segment of the current context */
-    cur_seg = GET_CURRENT_SEGMENT();
+    cur_seg = GET_CURRENT_SEGMENT(sm_p);
     assert(cur_seg);
 
     /*
@@ -680,7 +679,7 @@ static int lookup_segment_verify_attr_pr
     gossip_debug(GOSSIP_CLIENT_DEBUG,
                  "lookup state: lookup_segment_verify_attr_present\n");
 
-    cur_seg = GET_CURRENT_SEGMENT();
+    cur_seg = GET_CURRENT_SEGMENT(sm_p);
     assert(cur_seg);
 
     /*
@@ -733,14 +732,14 @@ static int lookup_segment_check_attr_typ
     gossip_debug(GOSSIP_CLIENT_DEBUG,
                  "lookup state: lookup_segment_check_attr_type\n");
 
-    cur_seg = GET_CURRENT_SEGMENT();
+    cur_seg = GET_CURRENT_SEGMENT(sm_p);
     assert(cur_seg);
 
     PINT_free_object_attr(&(cur_seg->seg_attr));
     PINT_copy_object_attr(&(cur_seg->seg_attr),
                           &(sm_p->getattr.attr));
 
-    cur_ctx = GET_CURRENT_CONTEXT();
+    cur_ctx = GET_CURRENT_CONTEXT(sm_p);
     assert(cur_ctx);
 
     switch(cur_seg->seg_attr.objtype)
@@ -813,7 +812,7 @@ static int lookup_segment_handle_relativ
     js_p->error_code = 0;
 
     /* grab the current segment that has a relative link to be resolved */
-    cur_seg = GET_CURRENT_SEGMENT();
+    cur_seg = GET_CURRENT_SEGMENT(sm_p);
     assert(cur_seg);
 
     relative_symlink_target = cur_seg->seg_attr.u.sym.target_path;
@@ -864,7 +863,7 @@ static int lookup_segment_handle_absolut
     js_p->error_code = 0;
 
     /* grab the current segment that has an absolute link to be resolved */
-    cur_seg = GET_CURRENT_SEGMENT();
+    cur_seg = GET_CURRENT_SEGMENT(sm_p);
     assert(cur_seg);
 
     absolute_symlink_target = cur_seg->seg_attr.u.sym.target_path;
@@ -909,10 +908,10 @@ static int lookup_context_check_completi
     gossip_debug(GOSSIP_CLIENT_DEBUG,
                  "lookup state: lookup_context_check_completion\n");
 
-    cur_ctx = GET_CURRENT_CONTEXT();
+    cur_ctx = GET_CURRENT_CONTEXT(sm_p);
     assert(cur_ctx);
 
-    cur_seg = GET_CURRENT_SEGMENT();
+    cur_seg = GET_CURRENT_SEGMENT(sm_p);
     assert(cur_seg);
 
     last_resolved_refn = cur_seg->seg_resolved_refn;
@@ -954,10 +953,10 @@ static int lookup_context_check_completi
             */
             sm_p->u.lookup.current_context--;
 
-            cur_ctx = GET_CURRENT_CONTEXT();
+            cur_ctx = GET_CURRENT_CONTEXT(sm_p);
             assert(cur_ctx);
 
-            cur_seg = GET_CURRENT_SEGMENT();
+            cur_seg = GET_CURRENT_SEGMENT(sm_p);
             assert(cur_seg);
 
             /*
@@ -983,7 +982,7 @@ static int lookup_context_check_completi
           have the previous one.  the current_segment has already been
           adjusted.
         */
-        cur_seg = GET_CURRENT_SEGMENT();
+        cur_seg = GET_CURRENT_SEGMENT(sm_p);
         assert(cur_seg);
 
         cur_seg->seg_starting_refn = last_resolved_refn;
@@ -1086,7 +1085,7 @@ static int lookup_segment_lookup_comp_fn
     */
     for(i = 0; i < resp_p->u.lookup_path.handle_count; i++)
     {
-        cur_seg = GET_SEGMENT_AT(current_seg_index + i);
+        cur_seg = GET_SEGMENT_AT(sm_p, current_seg_index + i);
         assert(cur_seg);
 
         if (i > 0)
@@ -1122,9 +1121,7 @@ static int lookup_segment_lookup_comp_fn
       if we've updated all of the segments that we could, advance
       the context's current segment position
     */
-    sm_p->u.lookup.contexts[
-        sm_p->u.lookup.current_context].current_segment =
-        current_seg_index + (i - 1);
+    GET_CURRENT_CONTEXT(sm_p)->current_segment = current_seg_index + (i - 1);
 
     return 0;
 }

Index: sys-mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-mkdir.sm,v
diff -p -u -r1.46 -r1.47
--- sys-mkdir.sm	23 Aug 2005 18:44:14 -0000	1.46
+++ sys-mkdir.sm	26 Aug 2005 19:10:56 -0000	1.47
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.37 -r1.38
--- sys-readdir.sm	23 Aug 2005 18:44:14 -0000	1.37
+++ sys-readdir.sm	26 Aug 2005 19:10:56 -0000	1.38
@@ -14,7 +14,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.89 -r1.90
--- sys-remove.sm	23 Aug 2005 18:44:14 -0000	1.89
+++ sys-remove.sm	26 Aug 2005 19:10:56 -0000	1.90
@@ -15,7 +15,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.38 -r1.39
--- sys-rename.sm	23 Aug 2005 18:44:14 -0000	1.38
+++ sys-rename.sm	26 Aug 2005 19:10:56 -0000	1.39
@@ -18,7 +18,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"
@@ -26,6 +25,7 @@
 #include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
+#include "pint-util.h"
 
 extern job_context_id pint_client_sm_context;
 

Index: sys-set-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-set-eattr.sm,v
diff -p -u -r1.3 -r1.4
--- sys-set-eattr.sm	1 Aug 2005 22:49:50 -0000	1.3
+++ sys-set-eattr.sm	26 Aug 2005 19:10:56 -0000	1.4
@@ -9,7 +9,6 @@
 #include <unistd.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "pvfs2-util.h"
 #include "job.h"

Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.38 -r1.39
--- sys-setattr.sm	23 Aug 2005 18:44:14 -0000	1.38
+++ sys-setattr.sm	26 Aug 2005 19:10:56 -0000	1.39
@@ -15,7 +15,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.52 -r1.53
--- sys-symlink.sm	23 Aug 2005 18:44:14 -0000	1.52
+++ sys-symlink.sm	26 Aug 2005 19:10:56 -0000	1.53
@@ -14,7 +14,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

Index: sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.40 -r1.41
--- sys-truncate.sm	23 Aug 2005 18:44:14 -0000	1.40
+++ sys-truncate.sm	26 Aug 2005 19:10:56 -0000	1.41
@@ -14,7 +14,6 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "state-machine-fns.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"

