Index: src/client/sysint/client-job-timer.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-job-timer.sm,v
retrieving revision 1.6
diff -u -a -p -r1.6 client-job-timer.sm
--- src/client/sysint/client-job-timer.sm	13 Apr 2007 05:14:16 -0000	1.6
+++ src/client/sysint/client-job-timer.sm	29 Aug 2007 16:57:47 -0000
@@ -17,11 +17,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static int job_timer_do_work(
-    struct PINT_smcb *smcb, job_status_s* js_p);
-static int job_timer_error(
-    struct PINT_smcb *smcb, job_status_s* js_p);
-
 %%
 
 machine pvfs2_client_job_timer_sm
Index: src/client/sysint/fs-add.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/fs-add.sm,v
retrieving revision 1.16
diff -u -a -p -r1.16 fs-add.sm
--- src/client/sysint/fs-add.sm	17 Aug 2007 04:04:24 -0000	1.16
+++ src/client/sysint/fs-add.sm	29 Aug 2007 16:57:47 -0000
@@ -44,12 +44,6 @@ enum {
 gen_mutex_t mt_config = GEN_MUTEX_INITIALIZER;
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action fs_add_parent_cleanup(struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action pvfs2_server_prepare_fetch_config(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action fs_add_final_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_fs_add_sm
Index: src/client/sysint/lookup-ncache.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/lookup-ncache.sm,v
retrieving revision 1.17
diff -u -a -p -r1.17 lookup-ncache.sm
--- src/client/sysint/lookup-ncache.sm	13 Apr 2007 05:14:16 -0000	1.17
+++ src/client/sysint/lookup-ncache.sm	29 Aug 2007 16:57:47 -0000
@@ -61,8 +61,6 @@ enum
     LOOKUP_NCACHE_MISS = 1
 };
 
-static int lookup_ncache_lookup(struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 nested machine pvfs2_client_lookup_ncache_sm
Index: src/client/sysint/mgmt-create-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-create-dirent.sm,v
retrieving revision 1.16
diff -u -a -p -r1.16 mgmt-create-dirent.sm
--- src/client/sysint/mgmt-create-dirent.sm	13 Apr 2007 05:14:16 -0000	1.16
+++ src/client/sysint/mgmt-create-dirent.sm	29 Aug 2007 16:57:47 -0000
@@ -26,13 +26,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action mgmt_create_dirent_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_create_dirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_create_dirent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int mgmt_create_dirent_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 
Index: src/client/sysint/mgmt-event-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-event-mon-list.sm,v
retrieving revision 1.29
diff -u -a -p -r1.29 mgmt-event-mon-list.sm
--- src/client/sysint/mgmt-event-mon-list.sm	13 Apr 2007 05:14:16 -0000	1.29
+++ src/client/sysint/mgmt-event-mon-list.sm	29 Aug 2007 16:57:47 -0000
@@ -24,11 +24,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action mgmt_event_mon_list_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_event_mon_list_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 /* completion function prototypes */
 static int event_mon_list_comp_fn(
     void* v_p, struct PVFS_server_resp* resp_p, int i);
Index: src/client/sysint/mgmt-get-dfile-array.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-get-dfile-array.sm,v
retrieving revision 1.30
diff -u -a -p -r1.30 mgmt-get-dfile-array.sm
--- src/client/sysint/mgmt-get-dfile-array.sm	13 Apr 2007 05:14:16 -0000	1.30
+++ src/client/sysint/mgmt-get-dfile-array.sm	29 Aug 2007 16:57:47 -0000
@@ -27,9 +27,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action mgmt_get_dfile_array_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_client_mgmt_get_dfile_array_sm
Index: src/client/sysint/mgmt-get-dirdata-handle.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-get-dirdata-handle.sm,v
retrieving revision 1.12
diff -u -a -p -r1.12 mgmt-get-dirdata-handle.sm
--- src/client/sysint/mgmt-get-dirdata-handle.sm	13 Apr 2007 05:14:16 -0000	1.12
+++ src/client/sysint/mgmt-get-dirdata-handle.sm	29 Aug 2007 16:57:47 -0000
@@ -28,13 +28,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action mgmt_get_dirdata_handle_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_get_dirdata_handle_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_get_dirdata_handle_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int mgmt_get_dirdata_handle_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 
Index: src/client/sysint/mgmt-iterate-handles-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-iterate-handles-list.sm,v
retrieving revision 1.28
diff -u -a -p -r1.28 mgmt-iterate-handles-list.sm
--- src/client/sysint/mgmt-iterate-handles-list.sm	13 Apr 2007 05:14:16 -0000	1.28
+++ src/client/sysint/mgmt-iterate-handles-list.sm	29 Aug 2007 16:57:47 -0000
@@ -21,12 +21,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action mgmt_iterate_handles_list_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_iterate_handles_list_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int iterate_handles_list_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 
Index: src/client/sysint/mgmt-noop.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-noop.sm,v
retrieving revision 1.32
diff -u -a -p -r1.32 mgmt-noop.sm
--- src/client/sysint/mgmt-noop.sm	13 Apr 2007 05:14:16 -0000	1.32
+++ src/client/sysint/mgmt-noop.sm	29 Aug 2007 16:57:47 -0000
@@ -26,11 +26,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action mgmt_noop_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_noop_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_client_mgmt_noop_sm
Index: src/client/sysint/mgmt-perf-mon-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-perf-mon-list.sm,v
retrieving revision 1.32
diff -u -a -p -r1.32 mgmt-perf-mon-list.sm
--- src/client/sysint/mgmt-perf-mon-list.sm	13 Apr 2007 05:14:16 -0000	1.32
+++ src/client/sysint/mgmt-perf-mon-list.sm	29 Aug 2007 16:57:47 -0000
@@ -25,12 +25,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action mgmt_perf_mon_list_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_perf_mon_list_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int perf_mon_list_comp_fn(
     void* v_p, struct PVFS_server_resp *resp_p, int i);
 

Index: src/client/sysint/mgmt-remove-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-remove-dirent.sm,v
retrieving revision 1.13
diff -u -a -p -r1.13 mgmt-remove-dirent.sm
--- src/client/sysint/mgmt-remove-dirent.sm	13 Apr 2007 05:14:16 -0000	1.13
+++ src/client/sysint/mgmt-remove-dirent.sm	29 Aug 2007 16:57:47 -0000
@@ -27,13 +27,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action mgmt_remove_dirent_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_remove_dirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_remove_dirent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int mgmt_remove_dirent_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 
Index: src/client/sysint/mgmt-remove-object.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-remove-object.sm,v
retrieving revision 1.13
diff -u -a -p -r1.13 mgmt-remove-object.sm
--- src/client/sysint/mgmt-remove-object.sm	13 Apr 2007 05:14:16 -0000	1.13
+++ src/client/sysint/mgmt-remove-object.sm	29 Aug 2007 16:57:47 -0000
@@ -27,13 +27,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action mgmt_remove_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_remove_object_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_remove_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int mgmt_remove_object_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 
Index: src/client/sysint/mgmt-setparam-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-setparam-list.sm,v
retrieving revision 1.35
diff -u -a -p -r1.35 mgmt-setparam-list.sm
--- src/client/sysint/mgmt-setparam-list.sm	31 May 2007 19:45:33 -0000	1.35
+++ src/client/sysint/mgmt-setparam-list.sm	29 Aug 2007 16:57:47 -0000
@@ -27,12 +27,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action mgmt_setparam_list_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_setparam_list_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int root_check_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 static int collect_old_values_comp_fn(

Index: src/client/sysint/mgmt-statfs-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-statfs-list.sm,v
retrieving revision 1.42
diff -u -a -p -r1.42 mgmt-statfs-list.sm
--- src/client/sysint/mgmt-statfs-list.sm	13 Apr 2007 05:14:16 -0000	1.42
+++ src/client/sysint/mgmt-statfs-list.sm	29 Aug 2007 16:57:47 -0000
@@ -28,14 +28,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action mgmt_statfs_list_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_statfs_list_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_statfs_list_parent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int statfs_list_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
 

Index: src/client/sysint/perf-count-timer.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/perf-count-timer.sm,v
retrieving revision 1.3
diff -u -a -p -r1.3 perf-count-timer.sm
--- src/client/sysint/perf-count-timer.sm	13 Apr 2007 05:14:16 -0000	1.3
+++ src/client/sysint/perf-count-timer.sm	29 Aug 2007 16:57:47 -0000
@@ -16,11 +16,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action perf_count_timer_do_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action perf_count_timer_error(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_client_perf_count_timer_sm
Index: src/client/sysint/pint-sysdev-unexp.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-sysdev-unexp.sm,v
retrieving revision 1.2
diff -u -a -p -r1.2 pint-sysdev-unexp.sm
--- src/client/sysint/pint-sysdev-unexp.sm	13 Apr 2007 05:14:16 -0000	1.2
+++ src/client/sysint/pint-sysdev-unexp.sm	29 Aug 2007 16:57:47 -0000
@@ -17,11 +17,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static int sysdev_unexp_post(
-    struct PINT_smcb *smcb, job_status_s* js_p);
-static int sysdev_unexp_cleanup(
-    struct PINT_smcb *smcb, job_status_s* js_p);
-
 %%
 
 machine pvfs2_sysdev_unexp_sm
Index: src/client/sysint/remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/remove.sm,v
retrieving revision 1.26
diff -u -a -p -r1.26 remove.sm
--- src/client/sysint/remove.sm	13 Apr 2007 05:14:16 -0000	1.26
+++ src/client/sysint/remove.sm	29 Aug 2007 16:57:47 -0000
@@ -24,21 +24,6 @@ enum
     REMOVE_MUST_REMOVE_DATAFILES = 1,
 };
 
-static PINT_sm_action remove_getattr_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_getattr_analyze_results(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_datafile_remove_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_datafile_remove_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_object_remove_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_object_remove_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_helper_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 #define HANDLE_REMOVE_ERROR(state)                                     \
 do {                                                                   \
     char buf[64] = {0};                                                \
Index: src/client/sysint/server-get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/server-get-config.sm,v
retrieving revision 1.28
diff -u -a -p -r1.28 server-get-config.sm
--- src/client/sysint/server-get-config.sm	17 Aug 2007 04:04:24 -0000	1.28
+++ src/client/sysint/server-get-config.sm	29 Aug 2007 16:57:47 -0000
@@ -24,24 +24,9 @@ static int server_parse_config(
     char *fs_config_buf,
     uint32_t fs_config_buf_size);
 
-/* state function prototypes */
-static PINT_sm_action server_get_config_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action server_get_config_parent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action server_get_config_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action server_get_config_parse(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 static int server_get_config_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 
-static PINT_sm_action server_fetch_config_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static int server_fetch_config_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static int server_fetch_config_parent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 static int server_fetch_config_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 

Index: src/client/sysint/sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
retrieving revision 1.110
diff -u -a -p -r1.110 sys-create.sm
--- src/client/sysint/sys-create.sm	15 Aug 2007 15:48:16 -0000	1.110
+++ src/client/sysint/sys-create.sm	29 Aug 2007 16:57:47 -0000
@@ -34,30 +34,6 @@ enum
     CREATE_RETRY = 170
 };
 
-/* state function prototypes */
-static PINT_sm_action create_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_dspace_create_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_datafiles_setup_msgpair_array(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_datafiles_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_setattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_setattr_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_crdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_crdirent_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_delete_handles_setup_msgpair_array(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_parent_getattr_inspect(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 /* completion function prototypes */
 static int create_create_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);

Index: src/client/sysint/sys-del-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-del-eattr.sm,v
retrieving revision 1.9
diff -u -a -p -r1.9 sys-del-eattr.sm
--- src/client/sysint/sys-del-eattr.sm	13 Apr 2007 05:14:16 -0000	1.9
+++ src/client/sysint/sys-del-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -19,13 +19,10 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action del_eattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action del_eattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 static int del_eattr_comp_fn(
-    void *v_p, struct PVFS_server_resp *resp_p, int i);
+    void *v_p,
+    struct PVFS_server_resp *resp_p,
+    int i);
 
 %%
 
Index: src/client/sysint/sys-flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-flush.sm,v
retrieving revision 1.40
diff -u -a -p -r1.40 sys-flush.sm
--- src/client/sysint/sys-flush.sm	13 Apr 2007 05:14:16 -0000	1.40
+++ src/client/sysint/sys-flush.sm	29 Aug 2007 16:57:47 -0000
@@ -25,13 +25,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action flush_datafile_flush_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action flush_datafile_setup_msgpairarray(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action flush_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_client_flush_sm
Index: src/client/sysint/sys-get-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-get-eattr.sm,v
retrieving revision 1.11
diff -u -a -p -r1.11 sys-get-eattr.sm
--- src/client/sysint/sys-get-eattr.sm	16 Apr 2007 19:20:42 -0000	1.11
+++ src/client/sysint/sys-get-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -20,13 +20,10 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action get_eattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action get_eattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 static int get_eattr_comp_fn(
-    void *v_p, struct PVFS_server_resp *resp_p, int i);
+    void *v_p,
+    struct PVFS_server_resp *resp_p,
+    int i);
 
 %%
 
Index: src/client/sysint/sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
retrieving revision 1.108
diff -u -a -p -r1.108 sys-getattr.sm
--- src/client/sysint/sys-getattr.sm	15 Aug 2007 16:17:08 -0000	1.108
+++ src/client/sysint/sys-getattr.sm	29 Aug 2007 16:57:47 -0000
@@ -47,28 +47,6 @@ enum
     GETATTR_NEED_DATAFILE_SIZES = 2
 };
 
-/* state function prototypes for getattr nested machine */
-static PINT_sm_action getattr_acache_lookup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_acache_insert(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_object_getattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_object_getattr_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_datafile_getattr_setup_msgpairarray(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_datafile_getattr_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_datafile_getattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
-/* state function prototypes for the system interface getattr state machine */
-static PINT_sm_action getattr_set_sys_response(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 /* completion function prototypes */
 static int getattr_object_getattr_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
Index: src/client/sysint/sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
retrieving revision 1.157
diff -u -a -p -r1.157 sys-io.sm
--- src/client/sysint/sys-io.sm	15 Aug 2007 18:34:12 -0000	1.157
+++ src/client/sysint/sys-io.sm	29 Aug 2007 16:57:47 -0000
@@ -38,23 +38,6 @@ enum
     IO_DO_SMALL_IO
 };
 
-static PINT_sm_action io_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_datafile_setup_msgpairs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_datafile_post_msgpairs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_datafile_post_msgpairs_retry(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_datafile_complete_operations(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_analyze_results(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_analyze_size_results(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 /* Helper functions local to sys-io.sm. */
 
 static inline int io_complete_context_send_or_recv(
Index: src/client/sysint/sys-list-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-list-eattr.sm,v
retrieving revision 1.8
diff -u -a -p -r1.8 sys-list-eattr.sm
--- src/client/sysint/sys-list-eattr.sm	13 Apr 2007 05:14:16 -0000	1.8
+++ src/client/sysint/sys-list-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -19,13 +19,10 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action list_eattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action list_eattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 static int list_eattr_comp_fn(
-    void *v_p, struct PVFS_server_resp *resp_p, int i);
+    void *v_p,
+    struct PVFS_server_resp *resp_p,
+    int i);
 
 %%
 
Index: src/client/sysint/sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-lookup.sm,v
retrieving revision 1.69
diff -u -a -p -r1.69 sys-lookup.sm
--- src/client/sysint/sys-lookup.sm	27 Jun 2007 13:16:21 -0000	1.69
+++ src/client/sysint/sys-lookup.sm	29 Aug 2007 16:57:47 -0000
@@ -46,26 +46,6 @@ enum
     LOOKUP_NCACHE_HIT_FASTPATH = 8
 };
 
-/* state function prototypes */
-static PINT_sm_action lookup_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_segment_lookup_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_segment_lookup_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_segment_verify_attr_present(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_segment_check_attr_type(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_segment_handle_relative_link(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_segment_handle_absolute_link(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_context_check_completion(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int lookup_segment_lookup_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
 

Index: src/client/sysint/sys-mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-mkdir.sm,v
retrieving revision 1.61
diff -u -a -p -r1.61 sys-mkdir.sm
--- src/client/sysint/sys-mkdir.sm	13 Apr 2007 05:14:16 -0000	1.61
+++ src/client/sysint/sys-mkdir.sm	29 Aug 2007 16:57:47 -0000
@@ -35,27 +35,6 @@ enum
     MKDIR_SKIP_EATTR = 181
 };
 
-static PINT_sm_action mkdir_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_msg_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_msg_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_crdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_crdirent_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_seteattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_seteattr_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_delete_handle_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_parent_getattr_inspect(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int mkdir_msg_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
 static int mkdir_crdirent_comp_fn(
Index: src/client/sysint/sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
retrieving revision 1.51
diff -u -a -p -r1.51 sys-readdir.sm
--- src/client/sysint/sys-readdir.sm	13 Apr 2007 05:14:16 -0000	1.51
+++ src/client/sysint/sys-readdir.sm	29 Aug 2007 16:57:47 -0000
@@ -25,17 +25,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action readdir_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdir_msg_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdir_msg_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdir_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action do_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int readdir_msg_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
 
Index: src/client/sysint/sys-readdirplus.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdirplus.sm,v
retrieving revision 1.6
diff -u -a -p -r1.6 sys-readdirplus.sm
--- src/client/sysint/sys-readdirplus.sm	13 Apr 2007 05:14:16 -0000	1.6
+++ src/client/sysint/sys-readdirplus.sm	29 Aug 2007 16:57:47 -0000
@@ -35,18 +35,13 @@ enum {
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action readdirplus_fetch_attrs_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 static int readdirplus_fetch_attrs_comp_fn(void *v_p,
-    struct PVFS_server_resp *resp_p, int index);
-static PINT_sm_action readdirplus_fetch_sizes_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
+                               struct PVFS_server_resp *resp_p,
+                               int index);
+
 static int readdirplus_fetch_sizes_comp_fn(void *v_p,
-   struct PVFS_server_resp *resp_p, int index);
-static PINT_sm_action readdirplus_msg_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdirplus_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
+                               struct PVFS_server_resp *resp_p,
+                               int index);
 
 %%
 
Index: src/client/sysint/sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
retrieving revision 1.104
diff -u -a -p -r1.104 sys-remove.sm
--- src/client/sysint/sys-remove.sm	13 Apr 2007 05:14:16 -0000	1.104
+++ src/client/sysint/sys-remove.sm	29 Aug 2007 16:57:47 -0000
@@ -48,23 +48,6 @@ enum
     RETURN_STORED_ERROR_CODE
 };
 
-static PINT_sm_action remove_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_rmdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_generic_timer(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_rmdirent_retry_or_fail(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_crdirent_retry_or_fail(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_crdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_check_error_code(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int remove_rmdirent_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int i);
 static int remove_crdirent_comp_fn(
Index: src/client/sysint/sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
retrieving revision 1.55
diff -u -a -p -r1.55 sys-rename.sm
--- src/client/sysint/sys-rename.sm	13 Apr 2007 05:14:16 -0000	1.55
+++ src/client/sysint/sys-rename.sm	29 Aug 2007 16:57:47 -0000
@@ -38,37 +38,6 @@ enum
     RENAME_RMDIRENT_RETRY
 };
 
-static PINT_sm_action rename_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_lookups_setup_msgpair_array(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_lookups_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_crdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_rmdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_rmdirent_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_chdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_chdirent_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_check_for_remove(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_warn_user_to_run_fsck(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_generic_timer(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_crdirent_retry_or_fail(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_rmdirent_retry_or_fail(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rename_getattr_src_interpret(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int rename_lookups_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
 static int rename_crdirent_comp_fn(
Index: src/client/sysint/sys-set-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-set-eattr.sm,v
retrieving revision 1.10
diff -u -a -p -r1.10 sys-set-eattr.sm
--- src/client/sysint/sys-set-eattr.sm	19 Aug 2007 18:20:26 -0000	1.10
+++ src/client/sysint/sys-set-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -19,13 +19,10 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action set_eattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action set_eattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 static int set_eattr_comp_fn(
-    void *v_p, struct PVFS_server_resp *resp_p, int i);
+    void *v_p,
+    struct PVFS_server_resp *resp_p,
+    int i);
 
 %%
 
Index: src/client/sysint/sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
retrieving revision 1.50
diff -u -a -p -r1.50 sys-setattr.sm
--- src/client/sysint/sys-setattr.sm	13 Apr 2007 05:14:17 -0000	1.50
+++ src/client/sysint/sys-setattr.sm	29 Aug 2007 16:57:47 -0000
@@ -26,15 +26,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action setattr_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_msg_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_msg_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int setattr_msg_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
 
Index: src/client/sysint/sys-small-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-small-io.sm,v
retrieving revision 1.14
diff -u -a -p -r1.14 sys-small-io.sm
--- src/client/sysint/sys-small-io.sm	13 Apr 2007 05:14:17 -0000	1.14
+++ src/client/sysint/sys-small-io.sm	29 Aug 2007 16:57:47 -0000
@@ -28,12 +28,6 @@
  * to be initialized already.
  */
 
-static PINT_sm_action small_io_setup_msgpairs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
-static int small_io_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int small_io_completion_fn(void * user_args,
                                   struct PVFS_server_resp * resp_p,
                                   int index);
Index: src/client/sysint/sys-statfs.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-statfs.sm,v
retrieving revision 1.6
diff -u -a -p -r1.6 sys-statfs.sm
--- src/client/sysint/sys-statfs.sm	13 Apr 2007 05:14:17 -0000	1.6
+++ src/client/sysint/sys-statfs.sm	29 Aug 2007 16:57:47 -0000
@@ -27,11 +27,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-/* state function prototypes */
-static PINT_sm_action sys_statfs_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
-
 %%
 
 machine pvfs2_client_statfs_sm

Index: src/client/sysint/sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-symlink.sm,v
retrieving revision 1.69
diff -u -a -p -r1.69 sys-symlink.sm
--- src/client/sysint/sys-symlink.sm	13 Apr 2007 05:14:17 -0000	1.69
+++ src/client/sysint/sys-symlink.sm	29 Aug 2007 16:57:47 -0000
@@ -31,25 +31,6 @@ enum
     SYMLINK_RETRY = 170
 };
 
-static PINT_sm_action symlink_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_dspace_create_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_dspace_create_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_crdirent_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_crdirent_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_setattr_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_setattr_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_delete_handle_setup_msgpair(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action symlink_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int symlink_create_comp_fn(
     void *v_p, struct PVFS_server_resp *resp_p, int index);
 static int symlink_setattr_comp_fn(
Index: src/client/sysint/sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-truncate.sm,v
retrieving revision 1.55
diff -u -a -p -r1.55 sys-truncate.sm
--- src/client/sysint/sys-truncate.sm	24 Jul 2007 15:48:46 -0000	1.55
+++ src/client/sysint/sys-truncate.sm	29 Aug 2007 16:57:47 -0000
@@ -27,13 +27,6 @@
 
 extern job_context_id pint_client_sm_context;
 
-static PINT_sm_action truncate_datafile_setup_msgpairarray(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action truncate_datafile_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action truncate_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %% 
 
 machine pvfs2_client_truncate_sm
Index: src/common/misc/msgpairarray.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/msgpairarray.sm,v
retrieving revision 1.43
diff -u -a -p -r1.43 msgpairarray.sm
--- src/common/misc/msgpairarray.sm	17 Aug 2007 04:04:24 -0000	1.43
+++ src/common/misc/msgpairarray.sm	29 Aug 2007 16:57:47 -0000
@@ -51,17 +51,6 @@ enum
     MSGPAIRS_RETRY_NODELAY = 192
 };
 
-static PINT_sm_action  msgpairarray_init(
-        struct PINT_smcb *smcp, job_status_s *js_p);
-static PINT_sm_action  msgpairarray_post(
-        struct PINT_smcb *smcp, job_status_s *js_p);
-static PINT_sm_action  msgpairarray_post_retry(
-        struct PINT_smcb *smcp, job_status_s *js_p);
-static PINT_sm_action  msgpairarray_complete(
-        struct PINT_smcb *smcp, job_status_s *js_p);
-static PINT_sm_action  msgpairarray_completion_fn(
-        struct PINT_smcb *smcp, job_status_s *js_p);
-
 %%
 
 nested machine pvfs2_msgpairarray_sm
Index: src/common/misc/void.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/void.sm,v
retrieving revision 1.2
diff -u -a -p -r1.2 void.sm
--- src/common/misc/void.sm	13 Apr 2007 05:14:20 -0000	1.2
+++ src/common/misc/void.sm	29 Aug 2007 16:57:47 -0000
@@ -14,9 +14,6 @@
 #include "state-machine.h"
 
 
-static PINT_sm_action void_action(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_void_sm
Index: src/common/quickhash/quickhash.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/quickhash/quickhash.h,v
retrieving revision 1.13
diff -u -a -p -r1.13 quickhash.h
--- src/common/quickhash/quickhash.h	1 Jun 2007 20:18:55 -0000	1.13
+++ src/common/quickhash/quickhash.h	29 Aug 2007 16:57:47 -0000
@@ -25,7 +25,7 @@
 #else
 
 #include <stdlib.h>
-#include "quicklist.h"
+#include "../quicklist/quicklist.h"
 
 #define qhash_malloc(x)            malloc(x)
 #define qhash_free(x)              free(x)
Index: src/common/statecomp/codegen.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/statecomp/codegen.c,v
retrieving revision 1.25
diff -u -a -p -r1.25 codegen.c
--- src/common/statecomp/codegen.c	24 Apr 2007 22:04:12 -0000	1.25
+++ src/common/statecomp/codegen.c	29 Aug 2007 16:57:47 -0000
@@ -18,6 +18,7 @@
 static int needcomma = 1;
 
 static void gen_state_decl(char *state_name);
+static void gen_runfunc_decl(char *func_name);
 static void gen_state_start(char *state_name, char *machine_name);
 static void gen_state_action(
     enum state_action action, char *run_func, char *state_name);
@@ -39,7 +40,11 @@ void gen_machine(char *machine_name)
 
     /* dump forward declarations of all the states */
     for (s=states; s; s=s->next)
+    {
+        if(s->action == ACTION_RUN)
+            gen_runfunc_decl(s->function_or_machine);
         gen_state_decl(s->name);
+    }
 
     /* delcare the machine start point */
     fprintf(out_file, "\nstruct PINT_state_machine_s %s = {\n", machine_name);
@@ -96,6 +101,70 @@ void gen_machine(char *machine_name)
         free(s);
     }
     states = NULL;
+}
+
+#include "../quicklist/quicklist.h"
+#include "../quickhash/quickhash.h"
+#include <string.h>
+#include <assert.h>
+
+struct runfunc_decl_entry
+{
+    char *func_name;
+    struct qhash_head link;
+};
+
+static int runfunc_compare(void *key, struct qhash_head *link)
+{
+    if(!strcmp((char *)key, 
+               qhash_entry(link, struct runfunc_decl_entry, link)->func_name))
+    {
+        return 1;
+    }
+    return 0;
+}
+
+static int runfunc_hash(void *key, int table_size)
+{
+    char *k = (char *)key;
+    int h, g;
+    while(*k)
+    {
+        h = (h << 4) + *k++;
+        if((g = (h & 0xF0UL)))
+        {
+            h ^= g >> 24;
+            h ^= g;
+        }
+    }
+
+    return h % table_size;
+}
+
+static struct qhash_table *runfunc_table = NULL;
+
+static void gen_runfunc_decl(char *func_name)
+{
+    if(!runfunc_table)
+    {
+        runfunc_table = qhash_init(runfunc_compare, runfunc_hash, 1024);
+        assert(runfunc_table);
+    }
+
+    if(!qhash_search(runfunc_table, func_name))
+    {
+        struct runfunc_decl_entry *entry =
+            malloc(sizeof(struct runfunc_decl_entry));
+        assert(entry);
+
+        entry->func_name = strdup(func_name);
+        qhash_add(runfunc_table, entry->func_name, &entry->link);
+
+        fprintf(out_file,
+                "\nstatic PINT_sm_action %s(\n"
+                "\tstruct PINT_smcb *smcb, job_status_s *js_p);\n\n",
+                func_name);
+    }
 }
 
 static void gen_state_decl(char *state_name)
Index: src/server/chdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/chdirent.sm,v
retrieving revision 1.17
diff -u -a -p -r1.17 chdirent.sm
--- src/server/chdirent.sm	13 Apr 2007 05:14:30 -0000	1.17
+++ src/server/chdirent.sm	29 Aug 2007 16:57:47 -0000
@@ -19,25 +19,6 @@ enum
     UPDATE_DIR_ATTR_REQUIRED = 135
 };
 
-static PINT_sm_action chdirent_verify_parent_metadata_and_read_directory_entry_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_change_directory_entry(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_check_for_req_dir_update(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_update_directory_attr(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_read_directory_entry(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_read_directory_entry_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_change_directory_entry_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action chdirent_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_chdirent_sm
Index: src/server/crdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/crdirent.sm,v
retrieving revision 1.67
diff -u -a -p -r1.67 crdirent.sm
--- src/server/crdirent.sm	13 Apr 2007 05:14:30 -0000	1.67
+++ src/server/crdirent.sm	29 Aug 2007 16:57:47 -0000
@@ -20,23 +20,6 @@ enum
     UPDATE_DIR_ATTR_REQUIRED
 };
 
-static PINT_sm_action crdirent_setup_op(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action crdirent_validate(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action crdirent_read_directory_entry_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action crdirent_write_directory_entry(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action crdirent_check_for_req_dir_update(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action crdirent_update_directory_attr(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action crdirent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action validation_object_type_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_crdirent_sm
Index: src/server/create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/create.sm,v
retrieving revision 1.45
diff -u -a -p -r1.45 create.sm
--- src/server/create.sm	13 Apr 2007 05:14:30 -0000	1.45
+++ src/server/create.sm	29 Aug 2007 16:57:47 -0000
@@ -13,13 +13,6 @@
 #include "gossip.h"
 #include "pvfs2-internal.h"
 
-static PINT_sm_action create_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_create(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action create_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_create_sm
Index: src/server/del-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/del-eattr.sm,v
retrieving revision 1.12
diff -u -a -p -r1.12 del-eattr.sm
--- src/server/del-eattr.sm	13 Apr 2007 05:14:30 -0000	1.12
+++ src/server/del-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -14,13 +14,6 @@
 #include "pvfs2-util.h"
 #include "pint-util.h"
 
-static PINT_sm_action deleattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action deleattr_delobj_eattribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action deleattr_verify_eattribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_del_eattr_sm
Index: src/server/event-mon.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/event-mon.sm,v
retrieving revision 1.7
diff -u -a -p -r1.7 event-mon.sm
--- src/server/event-mon.sm	13 Apr 2007 05:14:30 -0000	1.7
+++ src/server/event-mon.sm	29 Aug 2007 16:57:47 -0000
@@ -14,11 +14,6 @@
 #include "pvfs2-server.h"
 #include "pint-event.h"
 
-static PINT_sm_action event_mon_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action event_mon_do_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_event_mon_sm
Index: src/server/final-response.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/final-response.sm,v
retrieving revision 1.35
diff -u -a -p -r1.35 final-response.sm
--- src/server/final-response.sm	13 Apr 2007 05:14:30 -0000	1.35
+++ src/server/final-response.sm	29 Aug 2007 16:57:47 -0000
@@ -29,13 +29,6 @@
  *   stored in s_op->scheduled_id
  */
 
-static PINT_sm_action final_response_release(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action final_response_send_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action final_response_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static void PINT_gossip_err_server_resp(
     struct PVFS_server_resp *resp);
 
Index: src/server/flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/flush.sm,v
retrieving revision 1.21
diff -u -a -p -r1.21 flush.sm
--- src/server/flush.sm	13 Apr 2007 05:14:30 -0000	1.21
+++ src/server/flush.sm	29 Aug 2007 16:57:47 -0000
@@ -25,16 +25,6 @@ enum
     FLUSH_BSTREAM = 5
 };
 
-static PINT_sm_action flush_check_type(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action flush_keyval_flush(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action flush_bstream_flush(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action flush_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action flush_check_error(
-    struct PINT_smcb *smcb, job_status_s *js_p);
 void flush_init_state_machine(void);
 
 %%
Index: src/server/get-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-attr.sm,v
retrieving revision 1.86
diff -u -a -p -r1.86 get-attr.sm
--- src/server/get-attr.sm	13 Apr 2007 05:14:30 -0000	1.86
+++ src/server/get-attr.sm	29 Aug 2007 16:57:47 -0000
@@ -46,35 +46,6 @@ enum
     STATE_DONE     = 12
 };
 
-static PINT_sm_action getattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_verify_attribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_read_symlink_target(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_get_dirdata_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_get_dirent_count(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_interpret_dirent_count(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_get_dir_hint(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_interpret_dir_hint(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_read_metafile_datafile_handles_if_required(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_read_metafile_distribution_if_required(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_read_metafile_hint(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_interpret_metafile_hint(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getattr_setup_op(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 nested machine pvfs2_get_attr_work_sm
Index: src/server/get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-config.sm,v
retrieving revision 1.37
diff -u -a -p -r1.37 get-config.sm
--- src/server/get-config.sm	17 Aug 2007 04:04:30 -0000	1.37
+++ src/server/get-config.sm	29 Aug 2007 16:57:47 -0000
@@ -14,11 +14,6 @@
 #include "server-config.h"
 #include "pvfs2-server.h"
 
-static PINT_sm_action getconfig_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action getconfig_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_get_config_sm
Index: src/server/get-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-eattr.sm,v
retrieving revision 1.18
diff -u -a -p -r1.18 get-eattr.sm
--- src/server/get-eattr.sm	16 Apr 2007 19:20:43 -0000	1.18
+++ src/server/get-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -25,15 +25,6 @@
 #include "pint-util.h"
 #include "pint-eattr.h"
 
-static PINT_sm_action geteattr_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action geteattr_read_eattrib(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action geteattr_check_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action geteattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_get_eattr_sm
Index: src/server/io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/io.sm,v
retrieving revision 1.67
diff -u -a -p -r1.67 io.sm
--- src/server/io.sm	13 Apr 2007 05:14:30 -0000	1.67
+++ src/server/io.sm	29 Aug 2007 16:57:47 -0000
@@ -19,17 +19,6 @@
 #include "pint-request.h"
 #include "pvfs2-internal.h"
 
-static PINT_sm_action io_send_ack(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_send_completion_ack(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_start_flow(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_release(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action io_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_io_sm
@@ -48,7 +37,7 @@ machine pvfs2_io_sm
         default => release;
     }
 
-    state send_negative_ack 
+    state send_negative_ack
     {
         run io_send_ack;
         default => release;
Index: src/server/iterate-handles.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/iterate-handles.sm,v
retrieving revision 1.8
diff -u -a -p -r1.8 iterate-handles.sm
--- src/server/iterate-handles.sm	13 Apr 2007 05:14:30 -0000	1.8
+++ src/server/iterate-handles.sm	29 Aug 2007 16:57:47 -0000
@@ -13,13 +13,6 @@
 #include "pvfs2-server.h"
 #include "server-config.h"
 
-static PINT_sm_action iterate_handles_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action iterate_handles_do_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action iterate_handles_fill_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_iterate_handles_sm
Index: src/server/job-timer.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/job-timer.sm,v
retrieving revision 1.5
diff -u -a -p -r1.5 job-timer.sm
--- src/server/job-timer.sm	13 Apr 2007 05:14:30 -0000	1.5
+++ src/server/job-timer.sm	29 Aug 2007 16:57:47 -0000
@@ -15,11 +15,6 @@
 #include "job-time-mgr.h"
 #include "server-config.h"
 
-static PINT_sm_action job_timer_do_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action job_timer_error(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_job_timer_sm
Index: src/server/list-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/list-attr.sm,v
retrieving revision 1.6
diff -u -a -p -r1.6 list-attr.sm
--- src/server/list-attr.sm	24 Apr 2007 22:04:31 -0000	1.6
+++ src/server/list-attr.sm	29 Aug 2007 16:57:47 -0000
@@ -36,25 +36,6 @@ enum 
     MORE_WORK = 1,
 };
 
-static PINT_sm_action listattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_verify_attribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_read_symlink_target(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_get_dirent_count(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_interpret_dirent_count(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_read_metafile_datafile_handles_if_required(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_read_metafile_distribution_if_required(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listattr_setup_op(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 nested machine pvfs2_list_attr_work_sm
Index: src/server/list-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/list-eattr.sm,v
retrieving revision 1.11
diff -u -a -p -r1.11 list-eattr.sm
--- src/server/list-eattr.sm	13 Apr 2007 05:14:30 -0000	1.11
+++ src/server/list-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -25,15 +25,6 @@
 #include "pint-util.h"
 #include "pint-eattr.h"
 
-static PINT_sm_action listeattr_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listeattr_list_eattrib(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listeattr_check_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action listeattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_list_eattr_sm
Index: src/server/lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/lookup.sm,v
retrieving revision 1.55
diff -u -a -p -r1.55 lookup.sm
--- src/server/lookup.sm	20 Jul 2007 19:37:06 -0000	1.55
+++ src/server/lookup.sm	29 Aug 2007 16:57:47 -0000
@@ -28,25 +28,6 @@ enum 
     LOOKUP_CHECK_DIR_ACLS = 24,
 };
 
-static PINT_sm_action lookup_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_read_object_metadata(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_verify_object_metadata(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_check_acls_if_needed(
-    struct PINT_smcb *smcb, job_status_s* js_p);
-static PINT_sm_action lookup_check_acls(
-    struct PINT_smcb *smcb, job_status_s* js_p);
-static PINT_sm_action lookup_read_directory_entry(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_read_directory_entry_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action lookup_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_lookup_sm
Index: src/server/mgmt-get-dirdata-handle.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mgmt-get-dirdata-handle.sm,v
retrieving revision 1.8
diff -u -a -p -r1.8 mgmt-get-dirdata-handle.sm
--- src/server/mgmt-get-dirdata-handle.sm	13 Apr 2007 05:14:30 -0000	1.8
+++ src/server/mgmt-get-dirdata-handle.sm	29 Aug 2007 16:57:47 -0000
@@ -14,13 +14,6 @@
 #include "gossip.h"
 #include "pvfs2-internal.h"
 
-static PINT_sm_action mgmt_get_dirdata_handle_from_parent(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_get_dirdata_handle_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_get_dirdata_handle_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_mgmt_get_dirdata_handle_sm
Index: src/server/mgmt-remove-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mgmt-remove-dirent.sm,v
retrieving revision 1.12
diff -u -a -p -r1.12 mgmt-remove-dirent.sm
--- src/server/mgmt-remove-dirent.sm	13 Apr 2007 05:14:30 -0000	1.12
+++ src/server/mgmt-remove-dirent.sm	29 Aug 2007 16:57:47 -0000
@@ -14,13 +14,6 @@
 #include "gossip.h"
 #include "pvfs2-internal.h"
 
-static PINT_sm_action mgmt_remove_dirent_get_dirdata_handle_from_parent(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_remove_dirent(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_remove_dirent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_mgmt_remove_dirent_sm
Index: src/server/mgmt-remove-object.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mgmt-remove-object.sm,v
retrieving revision 1.12
diff -u -a -p -r1.12 mgmt-remove-object.sm
--- src/server/mgmt-remove-object.sm	13 Apr 2007 05:14:30 -0000	1.12
+++ src/server/mgmt-remove-object.sm	29 Aug 2007 16:57:47 -0000
@@ -14,11 +14,6 @@
 #include "gossip.h"
 #include "pvfs2-internal.h"
 
-static PINT_sm_action mgmt_remove_dspace(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mgmt_remove_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_mgmt_remove_object_sm
Index: src/server/mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/mkdir.sm,v
retrieving revision 1.49
diff -u -a -p -r1.49 mkdir.sm
--- src/server/mkdir.sm	13 Apr 2007 05:14:30 -0000	1.49
+++ src/server/mkdir.sm	29 Aug 2007 16:57:47 -0000
@@ -15,21 +15,6 @@
 #include "pvfs2-internal.h"
 #include "pint-util.h"
 
-static PINT_sm_action mkdir_create(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_setattrib(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_create_dirdata_dspace(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_write_dirdata_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_error(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action mkdir_prep_sm(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 nested machine pvfs2_mkdir_work_sm
Index: src/server/noop.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/noop.sm,v
retrieving revision 1.6
diff -u -a -p -r1.6 noop.sm
--- src/server/noop.sm	13 Apr 2007 05:14:30 -0000	1.6
+++ src/server/noop.sm	29 Aug 2007 16:57:47 -0000
@@ -12,9 +12,6 @@
 
 #include "pvfs2-server.h"
 
-static PINT_sm_action noop_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_noop_sm
Index: src/server/perf-mon.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/perf-mon.sm,v
retrieving revision 1.13
diff -u -a -p -r1.13 perf-mon.sm
--- src/server/perf-mon.sm	13 Apr 2007 05:14:30 -0000	1.13
+++ src/server/perf-mon.sm	29 Aug 2007 16:57:47 -0000
@@ -15,11 +15,6 @@
 #include "pvfs2-server.h"
 #include "pint-perf-counter.h"
 
-static PINT_sm_action perf_mon_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action perf_mon_do_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static uint64_t* static_start_time_array_ms = NULL;
 static uint64_t* static_interval_array_ms = NULL;
 static int64_t** static_value_matrix = NULL;
Index: src/server/perf-update.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/perf-update.sm,v
retrieving revision 1.10
diff -u -a -p -r1.10 perf-update.sm
--- src/server/perf-update.sm	13 Apr 2007 05:14:30 -0000	1.10
+++ src/server/perf-update.sm	29 Aug 2007 16:57:47 -0000
@@ -15,11 +15,6 @@
 #include "pint-perf-counter.h"
 #include "server-config.h"
 
-static PINT_sm_action perf_update_do_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action perf_update_error(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_perf_update_sm
Index: src/server/prelude.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/prelude.sm,v
retrieving revision 1.69
diff -u -a -p -r1.69 prelude.sm
--- src/server/prelude.sm	20 Jul 2007 19:37:06 -0000	1.69
+++ src/server/prelude.sm	29 Aug 2007 16:57:47 -0000
@@ -23,17 +23,6 @@
  * - post the request to the request scheduler
  * - check permissions
  */
-static PINT_sm_action prelude_req_sched(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action prelude_perm_check(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action prelude_getattr_if_needed(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action prelude_check_acls_if_needed(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action prelude_check_acls(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 enum {
     PRELUDE_RUN_ACL_CHECKS = 1,
 };
Index: src/server/proto-error.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/proto-error.sm,v
retrieving revision 1.6
diff -u -a -p -r1.6 proto-error.sm
--- src/server/proto-error.sm	13 Apr 2007 05:14:30 -0000	1.6
+++ src/server/proto-error.sm	29 Aug 2007 16:57:47 -0000
@@ -13,11 +13,6 @@
 #include "pvfs2-server.h"
 #include "server-config.h"
 
-static PINT_sm_action proto_error_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action proto_error_init(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_proto_error_sm

Index: src/server/readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/readdir.sm,v
retrieving revision 1.50
diff -u -a -p -r1.50 readdir.sm
--- src/server/readdir.sm	13 Apr 2007 05:14:30 -0000	1.50
+++ src/server/readdir.sm	29 Aug 2007 16:57:47 -0000
@@ -22,17 +22,6 @@ enum
     STATE_ENOTDIR = 7
 };
 
-static PINT_sm_action readdir_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdir_read_dirdata_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdir_iterate_on_entries(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdir_verify_directory_metadata(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action readdir_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_readdir_sm
Index: src/server/remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/remove.sm,v
retrieving revision 1.57
diff -u -a -p -r1.57 remove.sm
--- src/server/remove.sm	24 Apr 2007 22:04:31 -0000	1.57
+++ src/server/remove.sm	29 Aug 2007 16:57:47 -0000
@@ -59,25 +59,6 @@ enum
     STATE_TYPE_DATAFILE = 2,
 };
 
-static PINT_sm_action remove_check_object_type(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_verify_object_metadata(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_remove_dspace(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_read_dirdata_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_get_dirent_count(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_check_dirdata_entries(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_remove_dirdata_dspace(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action remove_setup_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 nested machine pvfs2_remove_work_sm
Index: src/server/rmdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/rmdirent.sm,v
retrieving revision 1.54
diff -u -a -p -r1.54 rmdirent.sm
--- src/server/rmdirent.sm	13 Apr 2007 05:14:30 -0000	1.54
+++ src/server/rmdirent.sm	29 Aug 2007 16:57:47 -0000
@@ -19,21 +19,6 @@ enum
     UPDATE_DIR_ATTR_REQUIRED = 133
 };
 
-static PINT_sm_action rmdirent_verify_parent_metadata_and_read_directory_entry_handle(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rmdirent_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rmdirent_remove_directory_entry(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rmdirent_check_for_req_dir_update(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rmdirent_update_directory_attr(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rmdirent_remove_directory_entry_failure(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action rmdirent_setup_resp(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_rmdirent_sm
Index: src/server/set-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/set-attr.sm,v
retrieving revision 1.71
diff -u -a -p -r1.71 set-attr.sm
--- src/server/set-attr.sm	13 Apr 2007 05:14:30 -0000	1.71
+++ src/server/set-attr.sm	29 Aug 2007 16:57:47 -0000
@@ -20,19 +20,6 @@ enum
     STATE_SYMLINK = 8
 };
 
-static PINT_sm_action setattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_setobj_attribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_write_metafile_datafile_handles_if_required(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_write_metafile_distribution_if_required(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_write_symlink_target_if_required(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setattr_verify_attribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_set_attr_sm
Index: src/server/set-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/set-eattr.sm,v
retrieving revision 1.18
diff -u -a -p -r1.18 set-eattr.sm
--- src/server/set-eattr.sm	24 Apr 2007 22:04:31 -0000	1.18
+++ src/server/set-eattr.sm	29 Aug 2007 16:57:47 -0000
@@ -15,13 +15,6 @@
 #include "pint-util.h"
 #include "pint-eattr.h"
 
-static PINT_sm_action seteattr_verify_eattribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action seteattr_setobj_eattribs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action seteattr_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_set_eattr_sm
Index: src/server/setparam.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/setparam.sm,v
retrieving revision 1.32
diff -u -a -p -r1.32 setparam.sm
--- src/server/setparam.sm	13 Apr 2007 05:14:30 -0000	1.32
+++ src/server/setparam.sm	29 Aug 2007 16:57:47 -0000
@@ -16,11 +16,6 @@
 #include "pint-event.h"
 #include "pvfs2-internal.h"
 
-static PINT_sm_action setparam_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action setparam_work(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 static int check_fs_id(PVFS_fs_id fs_id);
 
 %%
Index: src/server/small-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/small-io.sm,v
retrieving revision 1.18
diff -u -a -p -r1.18 small-io.sm
--- src/server/small-io.sm	13 Apr 2007 05:14:30 -0000	1.18
+++ src/server/small-io.sm	29 Aug 2007 16:57:47 -0000
@@ -18,13 +18,6 @@
 #include "pint-distribution.h"
 #include "pint-request.h"
 
-static PINT_sm_action small_io_start_job(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action small_io_check_size(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action small_io_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_small_io_sm
Index: src/server/statfs.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/statfs.sm,v
retrieving revision 1.15
diff -u -a -p -r1.15 statfs.sm
--- src/server/statfs.sm	13 Apr 2007 05:14:30 -0000	1.15
+++ src/server/statfs.sm	29 Aug 2007 16:57:47 -0000
@@ -19,11 +19,6 @@
 #include <sys/sysinfo.h>
 #endif
 
-static PINT_sm_action statfs_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action statfs_do_statfs(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_statfs_sm
Index: src/server/truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/truncate.sm,v
retrieving revision 1.7
diff -u -a -p -r1.7 truncate.sm
--- src/server/truncate.sm	13 Apr 2007 05:14:30 -0000	1.7
+++ src/server/truncate.sm	29 Aug 2007 16:57:47 -0000
@@ -14,13 +14,6 @@
 #include "server-config.h"
 #include "pvfs2-server.h"
 
-static PINT_sm_action truncate_resize(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action truncate_check_error(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action truncate_cleanup(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_truncate_sm
Index: src/server/unexpected.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/unexpected.sm,v
retrieving revision 1.2
diff -u -a -p -r1.2 unexpected.sm
--- src/server/unexpected.sm	13 Apr 2007 05:14:30 -0000	1.2
+++ src/server/unexpected.sm	29 Aug 2007 16:57:47 -0000
@@ -13,11 +13,6 @@
 #include "pvfs2-server.h"
 #include "quicklist.h"
 
-static PINT_sm_action unexpected_post(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-static PINT_sm_action unexpected_map(
-    struct PINT_smcb *smcb, job_status_s *js_p);
-
 %%
 
 machine pvfs2_unexpected_sm