X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=6e9c0c81e11da9f09bd6d163a88eba919eda6e2e;hb=e49fed25d000a51b316b480c1bfb1b00c1f5d345;hp=745d81bb7d2c01e8276ed61b0d298f7134c235df;hpb=db4915b4f7fc8f74958c4d1891dc69b76cbbe383;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 745d81b..6e9c0c8 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -125,7 +125,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
     bluesky_insert_inode(fs, root);
     bluesky_inode_update_ctime(root, TRUE);
 
-    bluesky_inode_flush(fs, root);
+    bluesky_inode_do_sync(root);
     bluesky_superblock_flush(fs);
 
     return fs;
@@ -173,7 +173,7 @@ void bluesky_inode_unref(BlueSkyInode *inode)
                 if (b->type == BLUESKY_BLOCK_DIRTY) {
                     g_error("Deleting an inode with dirty file data!");
                 }
-                g_free(b->ref);
+                bluesky_cloudlog_unref(b->cloudref);
                 bluesky_string_unref(b->data);
             }
             g_array_unref(inode->blocks);
@@ -288,32 +288,14 @@ void bluesky_insert_inode(BlueSkyFS *fs, BlueSkyInode *inode)
     g_hash_table_insert(fs->inodes, &inode->inum, inode);
 }
 
-/* Deprecated: Synchronize an inode to stable storage. */
-void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode)
-{
-    GString *buf = g_string_new("");
-    bluesky_serialize_inode(buf, inode);
-    BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
-
-    char key[64];
-    sprintf(key, "inode-%016"PRIx64, inode->inum);
-
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_PUT;
-    async->key = g_strdup(key);
-    async->data = data;
-    bluesky_store_async_submit(async);
-    bluesky_store_async_unref(async);
-}
-
 /* Start writeback of an inode and all associated data. */
-void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
+void bluesky_inode_start_sync(BlueSkyInode *inode)
 {
     GList *log_items = NULL;
     BlueSkyFS *fs = inode->fs;
 
     if (inode->type == BLUESKY_REGULAR)
-        bluesky_file_flush(inode, barrier, &log_items);
+        bluesky_file_flush(inode, &log_items);
 
     GString *buf = g_string_new("");
     bluesky_serialize_inode(buf, inode);
@@ -334,48 +316,41 @@ void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
             if (b->type == BLUESKY_BLOCK_CACHED
                 || b->type == BLUESKY_BLOCK_REF)
             {
-                BlueSkyCloudID id = bluesky_cloudlog_id_from_string(b->ref);
+                BlueSkyCloudID id = b->cloudref->id;
                 g_array_append_val(cloudlog->pointers, id);
             }
         }
     }
 
-    log_items = g_list_prepend(log_items, bluesky_cloudlog_sync(cloudlog));
+    if (inode->committed_item != NULL)
+        bluesky_cloudlog_unref(inode->committed_item);
+    inode->committed_item = cloudlog;
 
+    bluesky_cloudlog_sync(cloudlog);
+    log_items = g_list_prepend(log_items, cloudlog);
     bluesky_cloudlog_insert(cloudlog);
 
     /* Wait for all log items to be committed to disk. */
-    while (log_items != NULL) {
-        BlueSkyLogItem *log_item = (BlueSkyLogItem *)log_items->data;
-        bluesky_log_item_finish(log_item);
-        log_items = g_list_delete_link(log_items, log_items);
-    }
+    bluesky_log_finish_all(log_items);
 
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_PUT;
-    async->key = g_strdup(key);
-    async->data = data;
-    bluesky_store_async_submit(async);
-    if (barrier != NULL)
-        bluesky_store_add_barrier(barrier, async);
-    bluesky_store_async_unref(async);
+    /* Mark the inode as clean */
+    inode->change_commit = inode->change_count;
+    inode->change_time = 0;
+    g_mutex_lock(inode->fs->lock);
+    bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+    inode->dirty_list = NULL;
+    g_mutex_unlock(inode->fs->lock);
 }
 
 /* Write back an inode and all associated data and wait for completion.  Inode
  * should already be locked. */
 void bluesky_inode_do_sync(BlueSkyInode *inode)
 {
-    BlueSkyStoreAsync *barrier = bluesky_store_async_new(inode->fs->store);
-    barrier->op = STORE_OP_BARRIER;
-
     if (bluesky_verbose) {
         g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
             "Synchronous writeback for inode %"PRIu64"...", inode->inum);
     }
-    bluesky_inode_start_sync(inode, barrier);
-    bluesky_store_async_submit(barrier);
-    bluesky_store_async_wait(barrier);
-    bluesky_store_async_unref(barrier);
+    bluesky_inode_start_sync(inode);
     if (bluesky_verbose) {
         g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
               "Writeback for inode %"PRIu64" complete", inode->inum);
@@ -447,6 +422,7 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
 /* Synchronize filesystem superblock to stable storage. */
 void bluesky_superblock_flush(BlueSkyFS *fs)
 {
+#if 0
     GString *buf = g_string_new("");
     bluesky_serialize_superblock(buf, fs);
     BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
@@ -459,4 +435,5 @@ void bluesky_superblock_flush(BlueSkyFS *fs)
     bluesky_store_async_unref(async);
 
     //bluesky_store_sync(fs->store);
+#endif
 }