(Mostly) merge local and cloud logging together.

[bluesky.git] / bluesky / file.c

diff --git a/bluesky/file.c b/bluesky/file.c
index 8faae00..2e4313e 100644 (file)
--- a/bluesky/file.c
+++ b/bluesky/file.c
@@ -258,7 +258,6 @@ void bluesky_block_fetch(BlueSkyFS *fs, BlueSkyBlock *block,
 
 /* Write the given block to cloud-backed storage and mark it clean. */
 void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block,
-                         BlueSkyStoreAsync *barrier,
                          GList **log_items)
 {
     if (block->type != BLUESKY_BLOCK_DIRTY)
@@ -272,21 +271,10 @@ void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block,
     cloudlog->inum = 0; //FIXME
     cloudlog->data = data;
     bluesky_string_ref(data);
-    *log_items = g_list_prepend(*log_items, bluesky_cloudlog_sync(cloudlog));
+    bluesky_cloudlog_sync(cloudlog);
+    *log_items = g_list_prepend(*log_items, cloudlog);
     bluesky_cloudlog_insert(cloudlog);
 
-    /* Store the file data asynchronously, and don't bother waiting for a
-     * response. */
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_PUT;
-    async->key = g_strdup(name);
-    bluesky_string_ref(data);
-    async->data = data;
-    bluesky_store_async_submit(async);
-    if (barrier != NULL)
-        bluesky_store_add_barrier(barrier, async);
-    bluesky_store_async_unref(async);
-
     g_free(block->ref);
     block->ref = name;
 
@@ -295,14 +283,13 @@ void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block,
 }
 
 /* Flush all blocks in a file to stable storage. */
-void bluesky_file_flush(BlueSkyInode *inode, BlueSkyStoreAsync *barrier,
-                        GList **log_items)
+void bluesky_file_flush(BlueSkyInode *inode, GList **log_items)
 {
     g_return_if_fail(inode->type == BLUESKY_REGULAR);
 
     for (int i = 0; i < inode->blocks->len; i++) {
         BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
-        bluesky_block_flush(inode->fs, b, barrier, log_items);
+        bluesky_block_flush(inode->fs, b, log_items);
     }
 }