[Pvfs2-cvs] commit by kunkel in pvfs2/src/common/misc:
msgpairarray.sm server-config.c pint-cached-config.c
pint-util.c str-utils.c
CVS commit program
cvs at parl.clemson.edu
Sat Feb 17 05:39:11 EST 2007
Update of /projects/cvsroot/pvfs2/src/common/misc
In directory parlweb1:/tmp/cvs-serv589/src/common/misc
Modified Files:
Tag: kunkel-hint-branch
msgpairarray.sm server-config.c pint-cached-config.c
pint-util.c str-utils.c
Log Message:
Sync hint-branch to current CVS version
Index: msgpairarray.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/msgpairarray.sm,v
diff -p -u -r1.36.2.2 -r1.36.2.3
--- msgpairarray.sm 25 Sep 2006 15:28:39 -0000 1.36.2.2
+++ msgpairarray.sm 17 Feb 2007 10:39:10 -0000 1.36.2.3
@@ -166,19 +166,18 @@ static int msgpairarray_post(PARENT_SM *
PVFS_msg_tag_t session_tag;
PINT_sm_msgpair_state *msg_p = NULL;
struct filesystem_configuration_s *cur_fs = NULL;
- int num_incomplete_msgpairs = (sm_p->msgarray_params.comp_ct / 2);
int must_loop_encodings = 0;
int local_enc_and_alloc = 0;
gossip_debug(
GOSSIP_MSGPAIR_DEBUG, "%s: sm %p "
"%d total message(s) with %d incomplete\n", __func__, sm_p,
- sm_p->msgarray_count * 2, num_incomplete_msgpairs * 2);
+ sm_p->msgarray_count * 2, sm_p->msgarray_params.comp_ct);
js_p->error_code = 0;
assert(sm_p->msgarray_count > 0);
- assert(num_incomplete_msgpairs && sm_p->msgarray_params.comp_ct);
+ assert(sm_p->msgarray_params.comp_ct >= 2);
for (i = 0; i < sm_p->msgarray_count; i++)
{
Index: server-config.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/server-config.c,v
diff -p -u -r1.90.2.3 -r1.90.2.4
--- server-config.c 2 Dec 2006 11:20:33 -0000 1.90.2.3
+++ server-config.c 17 Feb 2007 10:39:10 -0000 1.90.2.4
@@ -814,15 +814,18 @@ static const configoption_t options[] =
/* This option specifies the method used for trove. Currently the
* dbpf method is the default. Other methods include 'alt-aio'.
*
- * Note that this option can be specified in either the <Defaults>
- * context of the main fs.conf, or in a filesystem specific <StorageHints>
- * context, but the semantics of TroveMethod in the <Defaults>
+ * Note that this option can be specified in either the <a href="#Defaults">
+ * Defaults</a> context of the main fs.conf, or in a filesystem specific
+ * <a href="#StorageHints">StorageHints</a>
+ * context, but the semantics of TroveMethod in the
+ * <a href="#Defaults">Defaults</a>
* context is different from other options. The TroveMethod in the
- * <Defaults> context only specifies which method is used at
+ * <a href="#Defaults">Defaults</a> context only specifies which
+ * method is used at
* server initialization. It does not specify the default TroveMethod
* for all the filesystems the server supports. To set the TroveMethod
- * for a filesystem, the TroveMethod must be placed in the <StorageHints>
- * context for that filesystem.
+ * for a filesystem, the TroveMethod must be placed in the
+ * <a href="#StorageHints">StorageHints</a> context for that filesystem.
*/
{"TroveMethod", ARG_STR, get_trove_method, NULL,
CTX_DEFAULTS|CTX_GLOBAL|CTX_STORAGEHINTS, "dbpf"},
Index: pint-cached-config.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/pint-cached-config.c,v
diff -p -u -r1.19.2.1 -r1.19.2.2
--- pint-cached-config.c 8 Sep 2006 10:00:36 -0000 1.19.2.1
+++ pint-cached-config.c 17 Feb 2007 10:39:11 -0000 1.19.2.2
@@ -685,7 +685,7 @@ const char *PINT_cached_config_map_addr(
struct qlist_head *hash_link = NULL;
struct config_fs_cache_s *cur_config_cache = NULL;
- if (!(config && server_type))
+ if (!config)
{
return NULL;
}
@@ -711,7 +711,10 @@ const char *PINT_cached_config_map_addr(
{
if (cur_config_cache->server_array[i].addr == addr)
{
- *server_type = cur_config_cache->server_array[i].server_type;
+ if(server_type)
+ {
+ *server_type = cur_config_cache->server_array[i].server_type;
+ }
return (cur_config_cache->server_array[i].addr_string);
}
}
Index: pint-util.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/pint-util.c,v
diff -p -u -r1.13.2.3 -r1.13.2.4
--- pint-util.c 13 Jan 2007 10:16:42 -0000 1.13.2.3
+++ pint-util.c 17 Feb 2007 10:39:11 -0000 1.13.2.4
@@ -312,14 +312,13 @@ int PINT_check_mode(
{
int in_group_flag = 0;
int ret = 0;
- uint32_t perm_mask = (PVFS_ATTR_COMMON_UID |
- PVFS_ATTR_COMMON_GID |
- PVFS_ATTR_COMMON_PERM);
/* if we don't have masks for the permission information that we
* need, then the system is broken
*/
- assert((attr->mask & perm_mask) == perm_mask);
+ assert(attr->mask & PVFS_ATTR_COMMON_UID &&
+ attr->mask & PVFS_ATTR_COMMON_GID &&
+ attr->mask & PVFS_ATTR_COMMON_PERM);
gossip_debug(GOSSIP_PERMISSIONS_DEBUG, " - check_mode called --- "
"(uid=%d,gid=%d,access_type=%d)\n", uid, gid, access_type);
@@ -586,9 +585,9 @@ int PINT_check_acls(void *acl_buf, size_
{
pvfs2_acl_entry pe, *pa;
int i = 0, found = 0, count = 0;
- uint32_t perm_mask = (PVFS_ATTR_COMMON_UID |
- PVFS_ATTR_COMMON_GID |
- PVFS_ATTR_COMMON_PERM);
+ assert(attr->mask & PVFS_ATTR_COMMON_UID &&
+ attr->mask & PVFS_ATTR_COMMON_GID &&
+ attr->mask & PVFS_ATTR_COMMON_PERM);
if (acl_size == 0)
{
@@ -605,7 +604,6 @@ int PINT_check_acls(void *acl_buf, size_
gossip_debug(GOSSIP_PERMISSIONS_DEBUG, "uid = %d, gid = %d, want = %d\n",
uid, gid, want);
- assert((attr->mask & perm_mask) == perm_mask);
assert(acl_buf);
assert(acl_size % sizeof(pvfs2_acl_entry) == 0);
count = acl_size / sizeof(pvfs2_acl_entry);
Index: str-utils.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/str-utils.c,v
diff -p -u -r1.18.6.1 -r1.18.6.2
--- str-utils.c 25 Sep 2006 12:39:47 -0000 1.18.6.1
+++ str-utils.c 17 Feb 2007 10:39:11 -0000 1.18.6.2
@@ -277,7 +277,7 @@ int PINT_get_path_element(
{
int count = -1;
char *segp = (char *)0;
- void *segstate;
+ void *segstate = NULL;
char local_pathname[PVFS_NAME_MAX] = {0};
strncpy(local_pathname,pathname,PVFS_NAME_MAX);
More information about the Pvfs2-cvs
mailing list