Allow batched log writes when writing dirty inodes.

[bluesky.git] / bluesky / inode.c

diff --git a/bluesky/inode.c b/bluesky/inode.c
index a0b3c6a..e53c602 100644 (file)
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -42,8 +42,10 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
     if (inode->change_time == 0)
         inode->change_time = now;
 
+#if 0
     if (bluesky_options.writethrough_cache)
         bluesky_file_flush(inode, NULL);
+#endif
 
     g_mutex_lock(inode->fs->lock);
     bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
@@ -95,6 +97,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
         BlueSkyFS *fs = bluesky_deserialize_superblock(data->data);
         if (fs != NULL) {
             fs->store = store;
+            fs->log = bluesky_log_new("journal");
             g_print("Loaded filesystem superblock\n");
             g_free(fs->name);
             fs->name = g_strdup(name);
@@ -297,10 +300,11 @@ void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode)
 /* Start writeback of an inode and all associated data. */
 void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
 {
+    GList *log_items = NULL;
     BlueSkyFS *fs = inode->fs;
 
     if (inode->type == BLUESKY_REGULAR)
-        bluesky_file_flush(inode, barrier);
+        bluesky_file_flush(inode, barrier, &log_items);
 
     GString *buf = g_string_new("");
     bluesky_serialize_inode(buf, inode);
@@ -314,7 +318,14 @@ void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
     log_item->data = data;
     bluesky_string_ref(data);
     bluesky_log_item_submit(log_item, fs->log);
-    bluesky_log_item_finish(log_item);
+    log_items = g_list_prepend(log_items, log_item);
+
+    /* Wait for all log items to be committed to disk. */
+    while (log_items != NULL) {
+        log_item = (BlueSkyLogItem *)log_items->data;
+        bluesky_log_item_finish(log_item);
+        log_items = g_list_delete_link(log_items, log_items);
+    }
 
     BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
     async->op = STORE_OP_PUT;