[PVFS2-CVS] commit by pcarns in pvfs2/src/client/sysint: client-state-machine.c finalize.c fs-add.c initialize.c mgmt-misc.c mgmt-statfs-list.sm remove.sm shared-state-methods.c sys-create.sm sys-getattr.sm sys-io.sm sys-lookup.sm sys-mkdir.sm sys-readdir.sm sys-remove.sm sys-rename.sm sys-setattr.sm sys-symlink.sm

CVS commit program cvs at parl.clemson.edu
Thu Jul 8 18:02:20 EDT 2004


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

Modified Files:
	client-state-machine.c finalize.c fs-add.c initialize.c 
	mgmt-misc.c mgmt-statfs-list.sm remove.sm 
	shared-state-methods.c sys-create.sm sys-getattr.sm sys-io.sm 
	sys-lookup.sm sys-mkdir.sm sys-readdir.sm sys-remove.sm 
	sys-rename.sm sys-setattr.sm sys-symlink.sm 
Log Message:
rename pint-bucket interface to pint-cached-config


Index: client-state-machine.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.52 -r1.53
--- client-state-machine.c	8 Jul 2004 20:06:47 -0000	1.52
+++ client-state-machine.c	8 Jul 2004 21:02:19 -0000	1.53
@@ -844,7 +844,7 @@ int PINT_serv_msgpairarray_resolve_addrs
             PINT_client_sm_msgpair_state *msg_p = &msgarray[i];
             assert(msg_p);
 
-            ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+            ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                             msg_p->handle,
                                             msg_p->fs_id);
             if (ret != 0)

Index: finalize.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/finalize.c,v
diff -p -u -r1.29 -r1.30
--- finalize.c	8 Jul 2004 20:06:47 -0000	1.29
+++ finalize.c	8 Jul 2004 21:02:19 -0000	1.30
@@ -39,7 +39,7 @@ int PVFS_sys_finalize()
 {
     PINT_ncache_finalize();
     PINT_acache_finalize();
-    PINT_bucket_finalize();
+    PINT_cached_config_finalize();
 
     /* flush all known server configurations */
     PINT_server_config_mgr_finalize();

Index: fs-add.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/fs-add.c,v
diff -p -u -r1.17 -r1.18
--- fs-add.c	8 Jul 2004 20:06:47 -0000	1.17
+++ fs-add.c	8 Jul 2004 21:02:19 -0000	1.18
@@ -115,7 +115,7 @@ int PVFS_sys_fs_add(struct PVFS_sys_mnte
       reload all handle mappings as well as the interface with the new
       configuration information
     */
-    PINT_server_config_mgr_reload_bucket_interface();
+    PINT_server_config_mgr_reload_cached_config_interface();
 
     gen_mutex_unlock(&mt_config);
     return 0;

Index: initialize.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/initialize.c,v
diff -p -u -r1.86 -r1.87
--- initialize.c	8 Jul 2004 20:06:47 -0000	1.86
+++ initialize.c	8 Jul 2004 21:02:19 -0000	1.87
@@ -195,7 +195,7 @@ int PVFS_sys_initialize(int default_debu
     client_status_flag |= CLIENT_CONFIG_MGR_INIT;
 
     /* initialize the handle mapping interface */
-    ret = PINT_bucket_initialize();
+    ret = PINT_cached_config_initialize();
     if (ret < 0)
     {
         gossip_lerr("Error initializing handle mapping interface\n");

Index: mgmt-misc.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-misc.c,v
diff -p -u -r1.20 -r1.21
--- mgmt-misc.c	8 Jul 2004 20:06:47 -0000	1.20
+++ mgmt-misc.c	8 Jul 2004 21:02:19 -0000	1.21
@@ -35,7 +35,7 @@ const char* PVFS_mgmt_map_addr(PVFS_fs_i
 {
     struct server_configuration_s *server_config =
         PINT_get_server_config_struct(fs_id);
-    const char *ret = PINT_bucket_map_addr(
+    const char *ret = PINT_cached_config_map_addr(
         server_config, fs_id, addr, server_type);
 
     PINT_put_server_config_struct(server_config);
@@ -63,7 +63,7 @@ int PVFS_mgmt_statfs_all(PVFS_fs_id fs_i
     server_config = PINT_get_server_config_struct(fs_id);
     assert(server_config);
 
-    ret = PINT_bucket_count_servers(
+    ret = PINT_cached_config_count_servers(
         server_config, fs_id,  PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
         &real_count);
     PINT_put_server_config_struct(server_config);
@@ -91,7 +91,7 @@ int PVFS_mgmt_statfs_all(PVFS_fs_id fs_i
     assert(server_config);
 
     /* generate default list of servers */
-    ret = PINT_bucket_get_server_array(
+    ret = PINT_cached_config_get_server_array(
         server_config, fs_id, PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
         addr_array, &real_count);
     PINT_put_server_config_struct(server_config);
@@ -138,7 +138,7 @@ int PVFS_mgmt_setparam_all(
     server_config = PINT_get_server_config_struct(fs_id);
     assert(server_config);
 
-    ret = PINT_bucket_count_servers(
+    ret = PINT_cached_config_count_servers(
         server_config, fs_id,
         PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER, &count);
     PINT_put_server_config_struct(server_config);
@@ -158,7 +158,7 @@ int PVFS_mgmt_setparam_all(
     assert(server_config);
 
     /* generate default list of servers */
-    ret = PINT_bucket_get_server_array(
+    ret = PINT_cached_config_get_server_array(
         server_config, fs_id, PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
         addr_array, &count);
     PINT_put_server_config_struct(server_config);
@@ -201,7 +201,7 @@ int PVFS_mgmt_get_server_array(PVFS_fs_i
     server_config = PINT_get_server_config_struct(fs_id);
     assert(server_config);
 
-    ret = PINT_bucket_get_server_array(
+    ret = PINT_cached_config_get_server_array(
         server_config, fs_id, server_type, addr_array, inout_count_p);
     PINT_put_server_config_struct(server_config);
     return ret;
@@ -225,7 +225,7 @@ int PVFS_mgmt_count_servers(PVFS_fs_id f
     server_config = PINT_get_server_config_struct(fs_id);
     assert(server_config);
 
-    ret = PINT_bucket_count_servers(
+    ret = PINT_cached_config_count_servers(
         server_config, fs_id, server_type, count);
     PINT_put_server_config_struct(server_config);
     return ret;

Index: mgmt-statfs-list.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/mgmt-statfs-list.sm,v
diff -p -u -r1.24 -r1.25
--- mgmt-statfs-list.sm	8 Jul 2004 20:06:48 -0000	1.24
+++ mgmt-statfs-list.sm	8 Jul 2004 21:02:19 -0000	1.25
@@ -253,13 +253,13 @@ static int statfs_list_comp_fn(void *v_p
             sm_p->msgarray[i].svr_addr, &sm_stat->server_type);
 	assert(sm_stat->bmi_address);
 
-	ret = PINT_bucket_get_server_handle_count(
+	ret = PINT_cached_config_get_server_handle_count(
             sm_stat->bmi_address, sm_p->u.statfs_list.fs_id,
             &sm_stat->handles_total_count);
 
         if (ret)
         {
-            PVFS_perror_gossip("PINT_bucket_get_server_handle_count failed ",
+            PVFS_perror_gossip("PINT_cached_config_get_server_handle_count failed ",
                         ret);
             return ret;
         }

Index: remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/remove.sm,v
diff -p -u -r1.2 -r1.3
--- remove.sm	8 Jul 2004 20:06:48 -0000	1.2
+++ remove.sm	8 Jul 2004 21:02:19 -0000	1.3
@@ -186,7 +186,7 @@ static int remove_getattr_setup_msgpair(
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_RETRY;
     sm_p->msgpair.comp_fn = remove_getattr_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
+    ret = PINT_cached_config_map_to_server(&sm_p->msgpair.svr_addr,
                                     sm_p->msgpair.handle,
                                     sm_p->msgpair.fs_id);
     if (ret)
@@ -328,7 +328,7 @@ static int remove_check_dir_contents_set
     msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
     msg_p->comp_fn = remove_check_dir_contents_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)
@@ -426,7 +426,7 @@ static int remove_object_remove_setup_ms
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_RETRY;
     sm_p->msgpair.comp_fn = NULL;
 
-    ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
+    ret = PINT_cached_config_map_to_server(&sm_p->msgpair.svr_addr,
                                     sm_p->msgpair.handle,
                                     sm_p->msgpair.fs_id);
     if (ret)

Index: shared-state-methods.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/shared-state-methods.c,v
diff -p -u -r1.19 -r1.20
--- shared-state-methods.c	8 Jul 2004 20:06:48 -0000	1.19
+++ shared-state-methods.c	8 Jul 2004 21:02:19 -0000	1.20
@@ -49,7 +49,7 @@ int PINT_sm_common_parent_getattr_setup_
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_RETRY;
     sm_p->msgpair.comp_fn = PINT_sm_common_object_getattr_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
+    ret = PINT_cached_config_map_to_server(&sm_p->msgpair.svr_addr,
 				    sm_p->msgpair.handle,
 				    sm_p->msgpair.fs_id);
     if (ret)
@@ -98,7 +98,7 @@ int PINT_sm_common_object_getattr_setup_
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_RETRY;
     sm_p->msgpair.comp_fn = PINT_sm_common_object_getattr_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
+    ret = PINT_cached_config_map_to_server(&sm_p->msgpair.svr_addr,
 				    sm_p->msgpair.handle,
 				    sm_p->msgpair.fs_id);
     if (ret)

Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.47 -r1.48
--- sys-create.sm	8 Jul 2004 20:06:48 -0000	1.47
+++ sys-create.sm	8 Jul 2004 21:02:19 -0000	1.48
@@ -284,7 +284,7 @@ int PVFS_isys_create(
     }
     
     /* Determine the number of datafile objects to use */
-    ret = PINT_bucket_get_num_dfiles(sm_p->parent_ref.fs_id,
+    ret = PINT_cached_config_get_num_dfiles(sm_p->parent_ref.fs_id,
                                      sm_p->u.create.dist,
                                      attr,
                                      &sm_p->u.create.num_data_files);
@@ -512,7 +512,7 @@ static int create_dspace_create_setup_ms
     server_config = PINT_get_server_config_struct(
         sm_p->parent_ref.fs_id);
 
-    ret = PINT_bucket_get_next_meta(
+    ret = PINT_cached_config_get_next_meta(
         server_config, sm_p->parent_ref.fs_id,
         &msg_p->svr_addr, &meta_handle_extent_array);
 
@@ -616,7 +616,7 @@ static int create_datafiles_setup_msgpai
     server_config = PINT_get_server_config_struct(
         sm_p->parent_ref.fs_id);
 
-    ret = PINT_bucket_get_next_io(
+    ret = PINT_cached_config_get_next_io(
         server_config,
         sm_p->parent_ref.fs_id,
         sm_p->u.create.num_data_files,
@@ -713,7 +713,7 @@ static int create_setattr_setup_msgpair(
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = create_setattr_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)
@@ -770,7 +770,7 @@ static int create_crdirent_setup_msgpair
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = create_crdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     sm_p->parent_ref.handle,
                                     sm_p->parent_ref.fs_id);
     if (ret)
@@ -819,7 +819,7 @@ static int create_delete_handles_setup_m
 
     memset(&sm_p->msgpair, 0, sizeof(PINT_client_sm_msgpair_state));
 
-    ret = PINT_bucket_map_to_server(&metafile_server_addr,
+    ret = PINT_cached_config_map_to_server(&metafile_server_addr,
                                     sm_p->u.create.metafile_handle,
                                     sm_p->parent_ref.fs_id);
     if (ret)

Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.59 -r1.60
--- sys-getattr.sm	8 Jul 2004 20:06:48 -0000	1.59
+++ sys-getattr.sm	8 Jul 2004 21:02:19 -0000	1.60
@@ -254,7 +254,7 @@ static int getattr_object_getattr_setup_
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_RETRY;
     sm_p->msgpair.comp_fn = getattr_object_getattr_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
+    ret = PINT_cached_config_map_to_server(&sm_p->msgpair.svr_addr,
                                     sm_p->msgpair.handle,
                                     sm_p->msgpair.fs_id);
     if (ret)

Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.79 -r1.80
--- sys-io.sm	8 Jul 2004 20:06:48 -0000	1.79
+++ sys-io.sm	8 Jul 2004 21:02:19 -0000	1.80
@@ -497,7 +497,7 @@ static int io_datafile_setup_msgpairs(PI
         msg->retry_flag = PVFS_MSGPAIR_NO_RETRY;
         msg->comp_fn = NULL;
 
-        ret = PINT_bucket_map_to_server(
+        ret = PINT_cached_config_map_to_server(
                &msg->svr_addr, msg->handle, msg->fs_id);
         if (ret)
         {

Index: sys-lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.38 -r1.39
--- sys-lookup.sm	8 Jul 2004 20:06:48 -0000	1.38
+++ sys-lookup.sm	8 Jul 2004 21:02:19 -0000	1.39
@@ -562,7 +562,7 @@ int PVFS_sys_lookup(
         parent.handle = 0;
         parent.fs_id = fs_id;
 
-        ret = PINT_bucket_get_root_handle(parent.fs_id,&parent.handle);
+        ret = PINT_cached_config_get_root_handle(parent.fs_id,&parent.handle);
         if (ret < 0)
         {
             return ret;
@@ -654,7 +654,7 @@ static int lookup_segment_lookup_setup_m
     msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
     msg_p->comp_fn = lookup_segment_lookup_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)
@@ -761,7 +761,7 @@ static int lookup_segment_getattr_setup_
     msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
     msg_p->comp_fn = lookup_segment_getattr_comp_fn;
 
-    if (PINT_bucket_map_to_server(&msg_p->svr_addr,
+    if (PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                   msg_p->handle,
                                   msg_p->fs_id) < 0)
     {
@@ -936,7 +936,7 @@ static int lookup_segment_handle_absolut
       fs_id that this lookup started with.
     */
     root_refn.fs_id = sm_p->u.lookup.starting_refn.fs_id;
-    ret = PINT_bucket_get_root_handle(root_refn.fs_id, &root_refn.handle);
+    ret = PINT_cached_config_get_root_handle(root_refn.fs_id, &root_refn.handle);
     assert(ret == 0);
 
     ret = initialize_context(sm_p->u.lookup.contexts,

Index: sys-mkdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-mkdir.sm,v
diff -p -u -r1.25 -r1.26
--- sys-mkdir.sm	8 Jul 2004 20:06:48 -0000	1.25
+++ sys-mkdir.sm	8 Jul 2004 21:02:20 -0000	1.26
@@ -339,7 +339,7 @@ static int mkdir_msg_setup_msgpair(PINT_
     server_config = PINT_get_server_config_struct(
         sm_p->parent_ref.fs_id);
 
-    ret = PINT_bucket_get_next_meta(
+    ret = PINT_cached_config_get_next_meta(
         server_config, sm_p->parent_ref.fs_id,
         &msg_p->svr_addr, &meta_handle_extent_array);
 
@@ -416,7 +416,7 @@ static int mkdir_crdirent_setup_msgpair(
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = mkdir_crdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     sm_p->parent_ref.handle,
                                     sm_p->parent_ref.fs_id);
     if (ret)
@@ -460,7 +460,7 @@ static int mkdir_delete_handle_setup_msg
     sm_p->msgarray = msg_p;
     sm_p->msgarray_count = 1;
 
-    ret = PINT_bucket_map_to_server(&metafile_server_addr,
+    ret = PINT_cached_config_map_to_server(&metafile_server_addr,
                                     sm_p->u.mkdir.metafile_handle,
                                     sm_p->parent_ref.fs_id);
     if (ret)

Index: sys-readdir.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.18 -r1.19
--- sys-readdir.sm	8 Jul 2004 20:06:48 -0000	1.18
+++ sys-readdir.sm	8 Jul 2004 21:02:20 -0000	1.19
@@ -205,7 +205,7 @@ static int readdir_msg_setup_msgpair(PIN
     js_p->error_code = 0;
 
     /* determine the metadata server to contact */
-    ret = PINT_bucket_map_to_server(
+    ret = PINT_cached_config_map_to_server(
         &server_addr, sm_p->u.readdir.object_ref.handle,
         sm_p->u.readdir.object_ref.fs_id);
     if (ret)

Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.65 -r1.66
--- sys-remove.sm	8 Jul 2004 20:06:48 -0000	1.65
+++ sys-remove.sm	8 Jul 2004 21:02:20 -0000	1.66
@@ -270,7 +270,7 @@ static int remove_rmdirent_setup_msgpair
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_NO_RETRY;
     sm_p->msgpair.comp_fn = remove_rmdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
+    ret = PINT_cached_config_map_to_server(&sm_p->msgpair.svr_addr,
                                     sm_p->msgpair.handle,
                                     sm_p->msgpair.fs_id);
     if (ret)
@@ -322,7 +322,7 @@ static int remove_crdirent_setup_msgpair
     sm_p->msgpair.retry_flag = PVFS_MSGPAIR_NO_RETRY;
     sm_p->msgpair.comp_fn = remove_crdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
+    ret = PINT_cached_config_map_to_server(&sm_p->msgpair.svr_addr,
                                     sm_p->msgpair.handle,
                                     sm_p->msgpair.fs_id);
     if (ret)

Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.23 -r1.24
--- sys-rename.sm	8 Jul 2004 20:06:49 -0000	1.23
+++ sys-rename.sm	8 Jul 2004 21:02:20 -0000	1.24
@@ -517,7 +517,7 @@ static int rename_lookups_setup_msgpair_
         msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
         msg_p->comp_fn = rename_lookups_comp_fn;
 
-        ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+        ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                         msg_p->handle,
                                         msg_p->fs_id);
         if (ret)
@@ -580,7 +580,7 @@ static int rename_crdirent_setup_msgpair
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = rename_crdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)
@@ -639,7 +639,7 @@ static int rename_rmdirent_setup_msgpair
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = rename_rmdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)
@@ -722,7 +722,7 @@ static int rename_chdirent_setup_msgpair
     msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
     msg_p->comp_fn = rename_chdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)

Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.19 -r1.20
--- sys-setattr.sm	8 Jul 2004 20:06:49 -0000	1.19
+++ sys-setattr.sm	8 Jul 2004 21:02:20 -0000	1.20
@@ -265,7 +265,7 @@ static int setattr_msg_setup_msgpair(PIN
     msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
     msg_p->comp_fn = setattr_msg_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)

Index: sys-symlink.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.31 -r1.32
--- sys-symlink.sm	8 Jul 2004 20:06:49 -0000	1.31
+++ sys-symlink.sm	8 Jul 2004 21:02:20 -0000	1.32
@@ -387,7 +387,7 @@ static int symlink_dspace_create_setup_m
     server_config = PINT_get_server_config_struct(
         sm_p->parent_ref.fs_id);
 
-    ret = PINT_bucket_get_next_meta(
+    ret = PINT_cached_config_get_next_meta(
         server_config, sm_p->parent_ref.fs_id,
         &msg_p->svr_addr, &meta_handle_extent_array);
 
@@ -462,7 +462,7 @@ static int symlink_crdirent_setup_msgpai
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = symlink_crdirent_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     sm_p->parent_ref.handle,
                                     sm_p->parent_ref.fs_id);
     if (ret < 0)
@@ -536,7 +536,7 @@ static int symlink_setattr_setup_msgpair
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = symlink_setattr_comp_fn;
 
-    ret = PINT_bucket_map_to_server(&msg_p->svr_addr,
+    ret = PINT_cached_config_map_to_server(&msg_p->svr_addr,
                                     msg_p->handle,
                                     msg_p->fs_id);
     if (ret)
@@ -579,7 +579,7 @@ static int symlink_delete_handle_setup_m
     sm_p->msgarray = msg_p;
     sm_p->msgarray_count = 1;
 
-    ret = PINT_bucket_map_to_server(&metafile_server_addr,
+    ret = PINT_cached_config_map_to_server(&metafile_server_addr,
                                     sm_p->u.sym.symlink_handle,
                                     sm_p->parent_ref.fs_id);
     if (ret)



More information about the PVFS2-CVS mailing list