X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=metadata.cc;h=15bd7a51647d7ac02665fdd7f606516b804a8412;hp=2ae075190cf49afaed661fd53f66498843bb6a97;hb=3d780590edec4583eb3ef0ca16120afd0f7451f9;hpb=f38dd9bcb0caffd3fc9126b05788c936690e8288

diff --git a/metadata.cc b/metadata.cc
index 2ae0751..15bd7a5 100644
--- a/metadata.cc
+++ b/metadata.cc
@@ -1,7 +1,6 @@
-/* Cumulus: Smart Filesystem Backup to Dumb Servers
- *
- * Copyright (C) 2007-2008  The Regents of the University of California
- * Written by Michael Vrable <mvrable@cs.ucsd.edu>
+/* Cumulus: Efficient Filesystem Backup to the Cloud
+ * Copyright (C) 2007-2008 The Cumulus Developers
+ * See the AUTHORS file for a list of contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +49,6 @@ bool flag_full_metadata = false;
 
 /* TODO: Move to header file */
 extern LocalDb *db;
-void add_segment(const string& segment);
 
 /* Like strcmp, but sorts in the order that files will be visited in the
  * filesystem.  That is, we break paths apart at slashes, and compare path
@@ -297,8 +295,7 @@ void MetadataWriter::metadata_flush()
         // If indirectly referencing any other metadata logs, be sure those
         // segments are properly referenced.
         if (i->reused) {
-            add_segment(i->ref.get_segment());
-            db->UseSegment(i->ref.get_segment(), 1.0);
+            db->UseObject(i->ref);
         }
 
         // Write out an indirect reference to any previous objects which could
@@ -339,15 +336,13 @@ void MetadataWriter::metadata_flush()
     /* Write current metadata information to a new object. */
     LbsObject *meta = new LbsObject;
     meta->set_group("metadata");
-    meta->set_data(m.data(), m.size());
+    meta->set_data(m.data(), m.size(), NULL);
     meta->write(store);
-    meta->checksum();
 
     /* Write a reference to this block in the root. */
     ObjectReference ref = meta->get_ref();
     metadata_root << "@" << ref.to_string() << "\n";
-    add_segment(ref.get_segment());
-    db->UseSegment(ref.get_segment(), 1.0);
+    db->UseObject(ref);
 
     delete meta;
 
@@ -398,11 +393,9 @@ ObjectReference MetadataWriter::close()
 
     LbsObject *root = new LbsObject;
     root->set_group("metadata");
-    root->set_data(root_data.data(), root_data.size());
+    root->set_data(root_data.data(), root_data.size(), NULL);
     root->write(store);
-    root->checksum();
-    add_segment(root->get_ref().get_segment());
-    db->UseSegment(root->get_ref().get_segment(), 1.0);
+    db->UseObject(root->get_ref());
 
     ObjectReference ref = root->get_ref();
     delete root;