[Pvfs2-cvs] commit by robl in pvfs2-1/src/io/trove/trove-dbpf: dbpf-mgmt.c dbpf-sync.c

CVS commit program cvs at parl.clemson.edu
Mon Oct 23 17:28:44 EDT 2006


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

Modified Files:
	dbpf-mgmt.c dbpf-sync.c 
Log Message:
do things up c90-style (declarations before commands)


Index: dbpf-mgmt.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf/dbpf-mgmt.c,v
diff -u -w -p -u -r1.94 -r1.95
--- dbpf-mgmt.c	18 Oct 2006 16:01:12 -0000	1.94
+++ dbpf-mgmt.c	23 Oct 2006 21:28:43 -0000	1.95
@@ -1269,7 +1269,6 @@ int dbpf_collection_lookup(char *collnam
                            void *user_ptr,
                            TROVE_op_id *out_op_id_p)
 {
-	gossip_debug(GOSSIP_TROVE_DEBUG, "dbpf_collection_lookup of coll: %s\n", collname);
     int ret = -TROVE_EINVAL;
     struct dbpf_storage *sto_p = NULL;
     struct dbpf_collection *coll_p = NULL;
@@ -1278,6 +1277,8 @@ int dbpf_collection_lookup(char *collnam
     char path_name[PATH_MAX];
     char trove_dbpf_version[32] = {0};
     
+    gossip_debug(GOSSIP_TROVE_DEBUG, "dbpf_collection_lookup of coll: %s\n", 
+            collname);
     sto_p = my_storage_p;
     if (!sto_p)
     {

Index: dbpf-sync.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf/dbpf-sync.c,v
diff -u -w -p -u -r1.11 -r1.12
--- dbpf-sync.c	20 Sep 2006 21:48:08 -0000	1.11
+++ dbpf-sync.c	23 Oct 2006 21:28:43 -0000	1.12
@@ -156,16 +156,16 @@ int dbpf_sync_coalesce(dbpf_queued_op_t 
 
     if ( ! coll->meta_sync_enabled )
     {
+        int do_sync=0;
         gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
                      "[SYNC_COALESCE]: meta sync disabled, "
                      "moving operation to completion queue\n");
 
         ret = dbpf_queued_op_complete(qop_p, retcode, OP_COMPLETED);
+
         /*
          * Sync periodical if count < lw or if lw = 0 and count > hw 
          */
-        int do_sync=0;
-
         gen_mutex_lock(sync_context->mutex);
         sync_context->coalesce_counter++;
         if( (coll->c_high_watermark > 0 && 



More information about the Pvfs2-cvs mailing list