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

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 3e8d686..745d81b 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -48,6 +48,8 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
 #endif
 
     g_mutex_lock(inode->fs->lock);
+    bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
+    inode->unlogged_list = bluesky_list_prepend(&inode->fs->unlogged_list, inode);
     bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
     inode->dirty_list = bluesky_list_prepend(&inode->fs->dirty_list, inode);
     bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
@@ -89,6 +91,9 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
     fs->locations = g_hash_table_new(bluesky_cloudlog_hash,
                                      bluesky_cloudlog_equal);
 
+    fs->log_state = g_new0(BlueSkyCloudLogState, 1);
+    fs->log_state->data = g_string_new("");
+
     return fs;
 }
 
@@ -144,6 +149,7 @@ void bluesky_inode_unref(BlueSkyInode *inode)
         /* Sanity check: Is the inode clean? */
         if (inode->change_commit < inode->change_count
                 || inode->accessed_list != NULL
+                || inode->unlogged_list != NULL
                 || inode->dirty_list != NULL) {
             g_warning("Dropping inode which is not clean (commit %"PRIi64" < change %"PRIi64"; accessed_list = %p; dirty_list = %p)\n", inode->change_commit, inode->change_count, inode->accessed_list, inode->dirty_list);
         }
@@ -154,6 +160,7 @@ void bluesky_inode_unref(BlueSkyInode *inode)
         g_mutex_lock(inode->fs->lock);
         bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
         bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+        bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
         g_mutex_unlock(inode->fs->lock);
 
         /* Free file type specific data.  It should be an error for there to be
@@ -316,11 +323,23 @@ void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
     sprintf(key, "inode-%016"PRIx64, inode->inum);
 
     BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
-    cloudlog->type = LOGTYPE_DATA;
+    cloudlog->type = LOGTYPE_INODE;
     cloudlog->inum = inode->inum;
     cloudlog->data = data;
     bluesky_string_ref(data);
 
+    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_CACHED
+                || b->type == BLUESKY_BLOCK_REF)
+            {
+                BlueSkyCloudID id = bluesky_cloudlog_id_from_string(b->ref);
+                g_array_append_val(cloudlog->pointers, id);
+            }
+        }
+    }
+
     log_items = g_list_prepend(log_items, bluesky_cloudlog_sync(cloudlog));
 
     bluesky_cloudlog_insert(cloudlog);