Tue Aug 29 06:41:13 EDT 2006

Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv30492/src/client/sysint

Modified Files:
      Tag: kunkel-branch
	client-state-machine.c finalize.c fs-add.sm initialize.c 
	lookup-ncache.sm mgmt-create-dirent.sm mgmt-event-mon-list.sm 
	mgmt-get-dfile-array.sm mgmt-get-dirdata-handle.sm 
	mgmt-migrate.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 ncache.c 
	pint-sysint-utils.c pint-sysint-utils.h 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-list-eattr.sm sys-lookup.sm sys-mkdir.sm sys-readdir.sm 
	sys-remove.sm sys-rename.sm sys-set-eattr.sm sys-setattr.sm 
	sys-small-io.sm sys-statfs.sm sys-symlink.sm sys-truncate.sm 
Removed Files:
      Tag: kunkel-branch
	pint-servreq.h 
Log Message:
Backmerge with HEAD


Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.79.6.4 -r1.79.6.5

--- client-state-machine.c	26 Aug 2006 13:37:45 -0000	1.79.6.4
+++ client-state-machine.c	29 Aug 2006 10:41:12 -0000	1.79.6.5
@@ -12,7 +12,6 @@
 
 #include "pvfs2-sysint.h"
 #include "pint-sysint-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: finalize.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/finalize.c,v
diff -p -u -r1.36.20.2 -r1.36.20.3
--- finalize.c	24 Jul 2006 17:20:18 -0000	1.36.20.2
+++ finalize.c	29 Aug 2006 10:41:12 -0000	1.36.20.3
@@ -15,7 +15,6 @@
 #include "gen-locks.h"
 #include "pint-cached-config.h"
 #include "pint-dist-utils.h"
-#include "dotconf.h"
 #include "trove.h"
 #include "server-config-mgr.h"
 #include "PINT-reqproto-encode.h"

Index: fs-add.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/fs-add.sm,v
diff -p -u -r1.6 -r1.6.2.1
--- fs-add.sm	14 Jul 2006 21:13:50 -0000	1.6
+++ fs-add.sm	29 Aug 2006 10:41:12 -0000	1.6.2.1
@@ -31,9 +31,7 @@
 #include "pvfs2-util.h"
 #include "pint-sysint-utils.h"
 #include "gen-locks.h"
-#include "pint-servreq.h"
 #include "PINT-reqproto-encode.h"
-#include "dotconf.h"
 #include "trove.h"
 #include "server-config-mgr.h"
 #include "client-state-machine.h"

Index: initialize.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/initialize.c,v
diff -p -u -r1.99.16.3 -r1.99.16.4
--- initialize.c	18 Aug 2006 05:12:00 -0000	1.99.16.3
+++ initialize.c	29 Aug 2006 10:41:12 -0000	1.99.16.4
@@ -20,9 +20,7 @@
 #include "pint-dist-utils.h"
 #include "pint-sysint-utils.h"
 #include "gen-locks.h"
-#include "pint-servreq.h"
 #include "PINT-reqproto-encode.h"
-#include "dotconf.h"
 #include "trove.h"
 #include "server-config-mgr.h"
 #include "client-state-machine.h"

Index: lookup-ncache.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/lookup-ncache.sm,v
diff -p -u -r1.13.18.1 -r1.13.18.2
--- lookup-ncache.sm	18 Aug 2006 05:12:01 -0000	1.13.18.1
+++ lookup-ncache.sm	29 Aug 2006 10:41:12 -0000	1.13.18.2
@@ -52,7 +52,6 @@
 #include "gossip.h"
 #include "str-utils.h"
 
-#include "pint-servreq.h"
 #include "ncache.h"
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"

Index: mgmt-create-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-create-dirent.sm,v
diff -p -u -r1.11.6.2 -r1.11.6.3
--- mgmt-create-dirent.sm	19 Aug 2006 13:09:33 -0000	1.11.6.2
+++ mgmt-create-dirent.sm	29 Aug 2006 10:41:12 -0000	1.11.6.3
@@ -20,7 +20,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.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.26.6.1 -r1.26.6.2
--- mgmt-event-mon-list.sm	19 Aug 2006 13:09:34 -0000	1.26.6.1
+++ mgmt-event-mon-list.sm	29 Aug 2006 10:41:12 -0000	1.26.6.2
@@ -19,7 +19,6 @@
 #include "gossip.h"
 #include "str-utils.h"
 #include "pvfs2-mgmt.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.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.27.6.1 -r1.27.6.2
--- mgmt-get-dfile-array.sm	19 Aug 2006 13:09:34 -0000	1.27.6.1
+++ mgmt-get-dfile-array.sm	29 Aug 2006 10:41:12 -0000	1.27.6.2
@@ -21,7 +21,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"

Index: mgmt-get-dirdata-handle.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-get-dirdata-handle.sm,v
diff -p -u -r1.9.6.1 -r1.9.6.2
--- mgmt-get-dirdata-handle.sm	19 Aug 2006 13:09:34 -0000	1.9.6.1
+++ mgmt-get-dirdata-handle.sm	29 Aug 2006 10:41:12 -0000	1.9.6.2
@@ -22,7 +22,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"

Index: mgmt-migrate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/Attic/mgmt-migrate.sm,v
diff -p -u -r1.1.2.2 -r1.1.2.3
--- mgmt-migrate.sm	26 Aug 2006 13:37:45 -0000	1.1.2.2
+++ mgmt-migrate.sm	29 Aug 2006 10:41:12 -0000	1.1.2.3
@@ -14,7 +14,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "bmi.h"

Index: mgmt-noop.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-noop.sm,v
diff -p -u -r1.29.6.1 -r1.29.6.2
--- mgmt-noop.sm	19 Aug 2006 13:09:34 -0000	1.29.6.1
+++ mgmt-noop.sm	29 Aug 2006 10:41:12 -0000	1.29.6.2
@@ -20,7 +20,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "bmi.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.29.6.1 -r1.29.6.2
--- mgmt-perf-mon-list.sm	19 Aug 2006 13:09:34 -0000	1.29.6.1
+++ mgmt-perf-mon-list.sm	29 Aug 2006 10:41:12 -0000	1.29.6.2
@@ -20,7 +20,6 @@
 #include "gossip.h"
 #include "str-utils.h"
 #include "pvfs2-mgmt.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: mgmt-remove-dirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-remove-dirent.sm,v
diff -p -u -r1.9.6.1 -r1.9.6.2
--- mgmt-remove-dirent.sm	19 Aug 2006 13:09:34 -0000	1.9.6.1
+++ mgmt-remove-dirent.sm	29 Aug 2006 10:41:12 -0000	1.9.6.2
@@ -21,7 +21,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"

Index: mgmt-remove-object.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-remove-object.sm,v
diff -p -u -r1.9.6.1 -r1.9.6.2
--- mgmt-remove-object.sm	19 Aug 2006 13:09:34 -0000	1.9.6.1
+++ mgmt-remove-object.sm	29 Aug 2006 10:41:12 -0000	1.9.6.2
@@ -21,7 +21,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"

Index: mgmt-setparam-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-setparam-list.sm,v
diff -p -u -r1.31.6.1 -r1.31.6.2
--- mgmt-setparam-list.sm	19 Aug 2006 13:09:34 -0000	1.31.6.1
+++ mgmt-setparam-list.sm	29 Aug 2006 10:41:12 -0000	1.31.6.2
@@ -22,7 +22,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: mgmt-statfs-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-statfs-list.sm,v
diff -p -u -r1.39.6.1 -r1.39.6.2
--- mgmt-statfs-list.sm	19 Aug 2006 13:09:34 -0000	1.39.6.1
+++ mgmt-statfs-list.sm	29 Aug 2006 10:41:12 -0000	1.39.6.2
@@ -23,7 +23,6 @@
 #include "gossip.h"
 #include "str-utils.h"
 #include "pvfs2-mgmt.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: ncache.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/ncache.c,v
diff -p -u -r1.12.6.3 -r1.12.6.4
--- ncache.c	18 Aug 2006 05:12:01 -0000	1.12.6.3
+++ ncache.c	29 Aug 2006 10:41:12 -0000	1.12.6.4
@@ -98,6 +98,8 @@ void PINT_ncache_enable_perf_counter(
 int PINT_ncache_initialize(void)
 {
     int ret = -1;
+    unsigned int ncache_timeout_msecs;
+    char * ncache_timeout_str = NULL;
   
     gen_mutex_lock(&ncache_mutex);
   
@@ -113,8 +115,15 @@ int PINT_ncache_initialize(void)
     }
   
     /* fill in defaults that are specific to ncache */
+    ncache_timeout_str = getenv("PVFS2_NCACHE_TIMEOUT");
+    if (ncache_timeout_str != NULL) 
+        ncache_timeout_msecs = (unsigned int)strtoul(ncache_timeout_str,NULL,0);
+    else
+        ncache_timeout_msecs = NCACHE_DEFAULT_TIMEOUT_MSECS;
+
     ret = PINT_tcache_set_info(ncache, TCACHE_TIMEOUT_MSECS,
-                               NCACHE_DEFAULT_TIMEOUT_MSECS);
+                               ncache_timeout_msecs);
+                
     if(ret < 0)
     {
         PINT_tcache_finalize(ncache);

Index: pint-sysint-utils.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-sysint-utils.c,v
diff -p -u -r1.32.38.3 -r1.32.38.4
--- pint-sysint-utils.c	19 Aug 2006 13:09:34 -0000	1.32.38.3
+++ pint-sysint-utils.c	29 Aug 2006 10:41:13 -0000	1.32.38.4
@@ -10,11 +10,9 @@
 #include "pvfs2-sysint.h"
 #include "pvfs2-req-proto.h"
 #include "pint-sysint-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "acache.h"
 #include "PINT-reqproto-encode.h"
-#include "dotconf.h"
 #include "trove.h"
 #include "server-config-mgr.h"
 #include "str-utils.h"
@@ -35,20 +33,6 @@ struct server_configuration_s *PINT_get_
 void PINT_put_server_config_struct(struct server_configuration_s *config)
 {
     PINT_server_config_mgr_put_config(config);
-}
-
-/* check permissions of a PVFS object against the access mode
- *
- * returns 0 on success, -1 on error
- */
-int PINT_check_perms(
-    PVFS_object_attr attr,
-    PVFS_permissions mode,
-    int uid, int gid)
-{
-    return ((((attr.perms & mode) == mode) ||
-             ((attr.group == gid) && (attr.perms & mode) == mode) ||
-             (attr.owner == uid)) ? 0 : -1);
 }
 
 /* PINT_lookup_parent()

Index: pint-sysint-utils.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-sysint-utils.h,v
diff -p -u -r1.22.38.1 -r1.22.38.2
--- pint-sysint-utils.h	19 Aug 2006 13:09:34 -0000	1.22.38.1
+++ pint-sysint-utils.h	29 Aug 2006 10:41:13 -0000	1.22.38.2
@@ -25,61 +25,13 @@
 #include "pint-cached-config.h"
 #include "pvfs2-sysint.h"
 
-#include "dotconf.h"
 #include "trove.h"
 #include "server-config.h"
 
-/* maps bmi address to handle ranges/extents */
-typedef struct bmi_host_extent_table_s
-{
-    char *bmi_address;
-
-    /* ptrs are type struct extent */
-    PINT_llist *extent_list;
-} bmi_host_extent_table_s;
-
-typedef struct config_fs_cache_s
-{
-    struct qlist_head hash_link;
-    struct filesystem_configuration_s *fs;
-
-    /* ptrs are type bmi_host_extent_table_s */
-    PINT_llist *bmi_host_extent_tables;
-
-    /* index into fs->meta_handle_ranges obj (see server-config.h) */
-    PINT_llist *meta_server_cursor;
-
-    /* index into fs->data_handle_ranges obj (see server-config.h) */
-    PINT_llist *data_server_cursor;
-
-    /*
-      the following fields are used to cache arrays of unique physical
-      server addresses, of particular use to the mgmt interface
-    */
-    phys_server_desc_s* io_server_array;
-    int io_server_count;
-    phys_server_desc_s* meta_server_array;
-    int meta_server_count;
-    phys_server_desc_s* server_array;
-    int server_count;
-
-} config_fs_cache_s;
-
-int PINT_check_perms(
-    PVFS_object_attr attr,
-    PVFS_permissions mode,
-    int uid,
-    int gid);
-int PINT_do_lookup (
-    char* name,
-    PVFS_object_ref parent,
-    PVFS_credentials cred,
-    PVFS_object_ref *entry);
 int PINT_server_get_config(
     struct server_configuration_s *config,
     struct PVFS_sys_mntent* mntent,
     PVFS_hint * hints);
-void PINT_release_pvfstab(void);
 
 struct server_configuration_s *PINT_get_server_config_struct(
     PVFS_fs_id fs_id);

Index: remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/remove.sm,v
diff -p -u -r1.20.6.2 -r1.20.6.3
--- remove.sm	19 Aug 2006 13:09:34 -0000	1.20.6.2
+++ remove.sm	29 Aug 2006 10:41:13 -0000	1.20.6.3
@@ -12,7 +12,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"

Index: server-get-config.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.21.6.1 -r1.21.6.2
--- server-get-config.sm	19 Aug 2006 13:09:34 -0000	1.21.6.1
+++ server-get-config.sm	29 Aug 2006 10:41:13 -0000	1.21.6.2
@@ -14,7 +14,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.92.4.4 -r1.92.4.5
--- sys-create.sm	29 Aug 2006 09:37:17 -0000	1.92.4.4
+++ sys-create.sm	29 Aug 2006 10:41:13 -0000	1.92.4.5
@@ -20,7 +20,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "pint-distribution.h"
 #include "PINT-reqproto-encode.h"

Index: sys-del-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-del-eattr.sm,v
diff -p -u -r1.5.8.1 -r1.5.8.2
--- sys-del-eattr.sm	19 Aug 2006 13:09:34 -0000	1.5.8.1
+++ sys-del-eattr.sm	29 Aug 2006 10:41:13 -0000	1.5.8.2
@@ -14,7 +14,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: sys-flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-flush.sm,v
diff -p -u -r1.36.6.1 -r1.36.6.2
--- sys-flush.sm	19 Aug 2006 13:09:34 -0000	1.36.6.1
+++ sys-flush.sm	29 Aug 2006 10:41:13 -0000	1.36.6.2
@@ -18,7 +18,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"

Index: sys-get-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-get-eattr.sm,v
diff -p -u -r1.6.6.1 -r1.6.6.2
--- sys-get-eattr.sm	19 Aug 2006 13:09:34 -0000	1.6.6.1
+++ sys-get-eattr.sm	29 Aug 2006 10:41:13 -0000	1.6.6.2
@@ -14,7 +14,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.99.4.1 -r1.99.4.2
--- sys-getattr.sm	19 Aug 2006 13:09:34 -0000	1.99.4.1
+++ sys-getattr.sm	29 Aug 2006 10:41:13 -0000	1.99.4.2
@@ -15,14 +15,12 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "pvfs2-types-debug.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
 #include "pint-util.h"
 #include "pvfs2-util.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"

Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.146.4.2 -r1.146.4.3
--- sys-io.sm	19 Aug 2006 13:09:34 -0000	1.146.4.2
+++ sys-io.sm	29 Aug 2006 10:41:13 -0000	1.146.4.3
@@ -14,12 +14,10 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "pvfs2-types-debug.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"

Index: sys-list-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-list-eattr.sm,v
diff -p -u -r1.3.10.1 -r1.3.10.2
--- sys-list-eattr.sm	19 Aug 2006 13:09:34 -0000	1.3.10.1
+++ sys-list-eattr.sm	29 Aug 2006 10:41:13 -0000	1.3.10.2
@@ -14,7 +14,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.62.6.2 -r1.62.6.3
--- sys-lookup.sm	19 Aug 2006 13:09:34 -0000	1.62.6.2
+++ sys-lookup.sm	29 Aug 2006 10:41:13 -0000	1.62.6.3
@@ -20,7 +20,6 @@
 #include "str-utils.h"
 #include "pint-util.h"
 #include "ncache.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"

Index: sys-mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-mkdir.sm,v
diff -p -u -r1.54.4.2 -r1.54.4.3
--- sys-mkdir.sm	19 Aug 2006 13:09:34 -0000	1.54.4.2
+++ sys-mkdir.sm	29 Aug 2006 10:41:13 -0000	1.54.4.3
@@ -21,7 +21,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"
@@ -452,7 +451,6 @@ static int mkdir_crdirent_setup_msgpair(
         sm_p->object_ref.handle,
         sm_p->object_ref.fs_id,
         sm_p->hints);
-
 
     msg_p->fs_id = sm_p->object_ref.fs_id;
     msg_p->handle = sm_p->object_ref.handle;

Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.44.6.2 -r1.44.6.3
--- sys-readdir.sm	19 Aug 2006 13:09:34 -0000	1.44.6.2
+++ sys-readdir.sm	29 Aug 2006 10:41:13 -0000	1.44.6.3
@@ -18,7 +18,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "ncache.h"

Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.97.4.2 -r1.97.4.3
--- sys-remove.sm	19 Aug 2006 13:09:35 -0000	1.97.4.2
+++ sys-remove.sm	29 Aug 2006 10:41:13 -0000	1.97.4.3
@@ -19,7 +19,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "ncache.h"

Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.46.6.2 -r1.46.6.3
--- sys-rename.sm	19 Aug 2006 13:09:35 -0000	1.46.6.2
+++ sys-rename.sm	29 Aug 2006 10:41:13 -0000	1.46.6.3
@@ -22,7 +22,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"
@@ -909,6 +908,21 @@ static int rename_cleanup(PINT_client_sm
     {
         PINT_acache_invalidate(sm_p->object_ref);
     }
+    else
+    {
+        gossip_debug(GOSSIP_CLIENT_DEBUG,
+            "rename state: updating ncache with entry [%s] "
+            "ref.handle=%llu ref.fsid=%d\n",
+            sm_p->u.rename.entries[1],
+            llu(sm_p->u.rename.refns[0].handle),
+            sm_p->u.rename.parent_refns[0].fs_id);
+
+        PINT_ncache_update((const char*) sm_p->u.rename.entries[1],
+            (const PVFS_object_ref*) &(sm_p->u.rename.refns[0]),
+            (const PVFS_object_ref*) &(sm_p->u.rename.parent_refns[0]));
+    }
+        
+
 
     PINT_SM_GETATTR_STATE_CLEAR(sm_p->getattr);
 

Index: sys-set-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-set-eattr.sm,v
diff -p -u -r1.5.8.1 -r1.5.8.2
--- sys-set-eattr.sm	19 Aug 2006 13:09:35 -0000	1.5.8.1
+++ sys-set-eattr.sm	29 Aug 2006 10:41:13 -0000	1.5.8.2
@@ -14,7 +14,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.45.6.2 -r1.45.6.3
--- sys-setattr.sm	19 Aug 2006 13:09:35 -0000	1.45.6.2
+++ sys-setattr.sm	29 Aug 2006 10:41:13 -0000	1.45.6.3
@@ -19,7 +19,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"

Index: sys-small-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-small-io.sm,v
diff -p -u -r1.9.2.1 -r1.9.2.2
--- sys-small-io.sm	19 Aug 2006 13:09:35 -0000	1.9.2.1
+++ sys-small-io.sm	29 Aug 2006 10:41:13 -0000	1.9.2.2
@@ -14,12 +14,10 @@
 #include <assert.h>
 
 #include "client-state-machine.h"
-#include "pvfs2-types-debug.h"
 #include "pvfs2-debug.h"
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"

Index: sys-statfs.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-statfs.sm,v
diff -p -u -r1.2.10.1 -r1.2.10.2
--- sys-statfs.sm	19 Aug 2006 13:09:35 -0000	1.2.10.1
+++ sys-statfs.sm	29 Aug 2006 10:41:13 -0000	1.2.10.2
@@ -22,7 +22,6 @@
 #include "gossip.h"
 #include "str-utils.h"
 #include "pvfs2-mgmt.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 

Index: sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.61.6.2 -r1.61.6.3
--- sys-symlink.sm	19 Aug 2006 13:09:35 -0000	1.61.6.2
+++ sys-symlink.sm	29 Aug 2006 10:41:13 -0000	1.61.6.3
@@ -18,7 +18,6 @@
 #include "job.h"
 #include "gossip.h"
 #include "str-utils.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"

Index: sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.49.6.1 -r1.49.6.2
--- sys-truncate.sm	19 Aug 2006 13:09:35 -0000	1.49.6.1
+++ sys-truncate.sm	29 Aug 2006 10:41:13 -0000	1.49.6.2
@@ -20,7 +20,6 @@
 #include "str-utils.h"
 #include "pint-util.h"
 #include "pint-request.h"
-#include "pint-servreq.h"
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
 #include "acache.h"

--- pint-servreq.h	2006-08-29 06:41:14.000000000 -0400
+++ /dev/null	2004-06-24 14:04:38.000000000 -0400
@@ -1,74 +0,0 @@
-/*
- * (C) 2001 Clemson University and The University of Chicago
- *
- * See COPYING in top-level directory.
- */
-
-#ifndef _PINT_SERVREQ_H
-#define _PINT_SERVREQ_H
-
-#include "PINT-reqproto-encode.h"
-#include "pvfs2-sysint.h"
-#include "pint-sysint-utils.h"
-#include "pvfs2-req-proto.h"
-
-#if 0  /* unused */
-int PINT_send_req_array(PVFS_BMI_addr_t* addr_array,
-    struct PVFS_server_req* req_array,
-    enum PVFS_encoding_type encoding,
-    void** resp_encoded_array,
-    struct PINT_decoded_msg* resp_decoded_array,
-    int* error_code_array,
-    int array_size,
-    PVFS_msg_tag_t* op_tag_array);
-
-void PINT_release_req_array(PVFS_BMI_addr_t* addr_array,
-    struct PVFS_server_req* req_array,
-    enum PVFS_encoding_type encoding,
-    void** resp_encoded_array,
-    struct PINT_decoded_msg* resp_decoded_array,
-    int* error_code_array,
-    int array_size);
-#endif
-
-int PINT_send_req(PVFS_BMI_addr_t addr,
-    struct PVFS_server_req *req_p,
-    enum PVFS_encoding_type encoding,
-    struct PINT_decoded_msg *decoded_resp,
-    void** encoded_resp,
-    PVFS_msg_tag_t op_tag);
-
-void PINT_release_req(PVFS_BMI_addr_t addr,
-    struct PVFS_server_req *req_p,
-    enum PVFS_encoding_type encoding,
-    struct PINT_decoded_msg *decoded_resp,
-    void** encoded_resp,
-    PVFS_msg_tag_t op_tag);
-
-int PINT_recv_ack_array(PVFS_BMI_addr_t* addr_array,
-    bmi_size_t max_resp_size,
-    void** resp_encoded_array,
-    struct PINT_decoded_msg* resp_decoded_array,
-    int* error_code_array,
-    int array_size,
-    PVFS_msg_tag_t* op_tag_array);
-
-void PINT_release_ack_array(PVFS_BMI_addr_t* addr_array,
-    bmi_size_t max_resp_size,
-    void** resp_encoded_array,
-    struct PINT_decoded_msg* resp_decoded_array,
-    int* error_code_array,
-    int array_size);
-
-/* dunno where these belong, but here is better than nowhere. -- rob */
-void debug_print_type(void* thing, int type);
-
-/*
- * Local variables:
- *  c-indent-level: 4
- *  c-basic-offset: 4
- * End:
- *
- * vim: ts=8 sts=4 sw=4 expandtab
- */
-#endif

