[Pvfs2-cvs] commit by slang in pvfs2/src/io/trove/trove-dbpf: dbpf-dspace.c dbpf-keyval.c dbpf-mgmt.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb1:/tmp/cvs-serv1053/src/io/trove/trove-dbpf

Modified Files:
      Tag: pvfs-2-7-branch
	dbpf-dspace.c dbpf-keyval.c dbpf-mgmt.c 
Log Message:
merge new db changes to branch.


Index: dbpf-dspace.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-dspace.c,v
diff -p -u -r1.152.2.5 -r1.152.2.6
--- dbpf-dspace.c	3 Apr 2008 18:58:10 -0000	1.152.2.5
+++ dbpf-dspace.c	16 Jul 2008 22:29:52 -0000	1.152.2.6
@@ -259,6 +259,7 @@ static int dbpf_dspace_create_op_svc(str
     memset(&key, 0, sizeof(key));
     key.data = &new_handle;
     key.size = key.ulen = sizeof(new_handle);
+    key.flags = DB_DBT_USERMEM;
 
     memset(&data, 0, sizeof(data));
     data.data = &s_attr;
@@ -871,6 +872,7 @@ static int dbpf_dspace_verify_op_svc(str
     memset(&key, 0, sizeof(key));
     key.data = &op_p->handle;
     key.size = key.ulen = sizeof(TROVE_handle);
+    key.flags = DB_DBT_USERMEM;
 
     memset(&data, 0, sizeof(data));
     data.data = &s_attr;
@@ -1195,6 +1197,7 @@ static int getattr_one_handle(TROVE_obje
     memset(&key, 0, sizeof(key));
     key.data = &ref.handle;
     key.size = key.ulen = sizeof(TROVE_handle);
+    key.flags = DB_DBT_USERMEM;
 
     memset(&data, 0, sizeof(data));
     memset(&s_attr, 0, sizeof(TROVE_ds_storedattr_s));

Index: dbpf-keyval.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-keyval.c,v
diff -p -u -r1.85.2.1 -r1.85.2.2
--- dbpf-keyval.c	2 Apr 2008 15:48:40 -0000	1.85.2.1
+++ dbpf-keyval.c	16 Jul 2008 22:29:53 -0000	1.85.2.2
@@ -249,6 +249,7 @@ static int dbpf_keyval_read_op_svc(struc
     key.data = &key_entry;
     key.size = key.ulen = DBPF_KEYVAL_DB_ENTRY_TOTAL_SIZE(
         op_p->u.k_read.key->buffer_sz);
+    key.flags = DB_DBT_USERMEM;
 
     memset(&data, 0, sizeof(data));
     data.data = op_p->u.k_read.val->buffer;
@@ -385,6 +386,7 @@ static int dbpf_keyval_write_op_svc(stru
     key.data = &key_entry;
     key.size = key.ulen = DBPF_KEYVAL_DB_ENTRY_TOTAL_SIZE(
         op_p->u.k_write.key.buffer_sz);
+    key.flags = DB_DBT_USERMEM;
     data.data = op_p->u.k_write.val.buffer;
     data.size = op_p->u.k_write.val.buffer_sz;
 
@@ -1383,6 +1385,7 @@ static int dbpf_keyval_do_remove(
     memset(&db_key, 0, sizeof(db_key));
     db_key.data = &key_entry;
     db_key.size = db_key.ulen = DBPF_KEYVAL_DB_ENTRY_TOTAL_SIZE(key->buffer_sz);
+    db_key.flags = DB_DBT_USERMEM;
 
     gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
                  "keyval_db->del(handle= %llu, key= %*s (%d)) size=%d\n",

Index: dbpf-mgmt.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-mgmt.c,v
diff -p -u -r1.99.2.2 -r1.99.2.3
--- dbpf-mgmt.c	3 Apr 2008 18:58:10 -0000	1.99.2.2
+++ dbpf-mgmt.c	16 Jul 2008 22:29:53 -0000	1.99.2.3
@@ -503,6 +503,7 @@ int dbpf_collection_geteattr(TROVE_coll_
     memset(&db_data, 0, sizeof(db_data));
     db_key.data = key_p->buffer;
     db_key.size = key_p->buffer_sz;
+    db_key.flags = DB_DBT_USERMEM;
 
     db_data.data  = val_p->buffer;
     db_data.ulen  = val_p->buffer_sz;
@@ -725,6 +726,7 @@ int dbpf_collection_create(char *collnam
 
     key.data = collname;
     key.size = strlen(collname)+1;
+    key.flags = DB_DBT_USERMEM;
     data.data = &db_data;
     data.ulen = sizeof(db_data);
     data.flags = DB_DBT_USERMEM;
@@ -949,6 +951,7 @@ int dbpf_collection_remove(char *collnam
 
     key.data = collname;
     key.size = strlen(collname) + 1;
+    key.flags = DB_DBT_USERMEM;
     data.data = &db_data;
     data.ulen = sizeof(db_data);
     data.flags = DB_DBT_USERMEM;
@@ -1313,6 +1316,7 @@ int dbpf_collection_lookup(char *collnam
     memset(&data, 0, sizeof(data));
     key.data = collname;
     key.size = strlen(collname)+1;
+    key.flags = DB_DBT_USERMEM;
     data.data = &db_data;
     data.ulen = sizeof(db_data);
     data.flags = DB_DBT_USERMEM;
@@ -1398,6 +1402,7 @@ int dbpf_collection_lookup(char *collnam
     memset(&data, 0, sizeof(data));
     key.data = TROVE_DBPF_VERSION_KEY;
     key.size = strlen(TROVE_DBPF_VERSION_KEY);
+    key.flags = DB_DBT_USERMEM;
     data.data = &trove_dbpf_version;
     data.ulen = 32;
     data.flags = DB_DBT_USERMEM;