X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=39241ea25ee1ce4ddc469c34a3d1b35d55fba807;hb=3380ff6d419c7d1370c95cf476520ed5398e5b6d;hp=a76b4b97e8ab8a8a09baff6d17132763071670de;hpb=f2586554fd55cd3cc1be65ac33d1122d00372133;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index a76b4b9..39241ea 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -55,6 +55,9 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
     bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
     inode->accessed_list = bluesky_list_prepend(&inode->fs->accessed_list, inode);
     g_mutex_unlock(inode->fs->lock);
+
+    bluesky_cloudlog_unref(inode->committed_item);
+    inode->committed_item = NULL;
 }
 
 /* Unfortunately a glib hash table is only guaranteed to be able to store
@@ -292,31 +295,11 @@ void bluesky_insert_inode(BlueSkyFS *fs, BlueSkyInode *inode)
 void bluesky_inode_start_sync(BlueSkyInode *inode)
 {
     GList *log_items = NULL;
-    BlueSkyFS *fs = inode->fs;
 
     if (inode->type == BLUESKY_REGULAR)
         bluesky_file_flush(inode, &log_items);
 
-    GString *buf = g_string_new("");
-    bluesky_serialize_inode(buf, inode);
-
-    char key[64];
-    sprintf(key, "inode-%016"PRIx64, inode->inum);
-
-    BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
-    cloudlog->type = LOGTYPE_INODE;
-    cloudlog->inum = inode->inum;
-    cloudlog->data = bluesky_string_new_from_gstring(buf);
-
-    if (inode->type == BLUESKY_REGULAR) {
-        for (int i = 0; i < inode->blocks->len; i++) {
-            BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
-            if (b->type == BLUESKY_BLOCK_REF) {
-                BlueSkyCloudID id = b->ref->id;
-                g_array_append_val(cloudlog->pointers, id);
-            }
-        }
-    }
+    BlueSkyCloudLog *cloudlog = bluesky_serialize_inode(inode);
 
     bluesky_cloudlog_unref(inode->committed_item);
     inode->committed_item = cloudlog;
@@ -324,7 +307,6 @@ void bluesky_inode_start_sync(BlueSkyInode *inode)
     bluesky_cloudlog_sync(cloudlog);
     bluesky_cloudlog_ref(cloudlog);
     log_items = g_list_prepend(log_items, cloudlog);
-    bluesky_cloudlog_insert(cloudlog);
 
     /* Wait for all log items to be committed to disk. */
     bluesky_log_finish_all(log_items);
@@ -333,8 +315,8 @@ void bluesky_inode_start_sync(BlueSkyInode *inode)
     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;
+    bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
+    inode->unlogged_list = NULL;
     g_mutex_unlock(inode->fs->lock);
 }