X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=a79bcc1147eb3a21a7525a480f892b2bf86e9513;hb=a82b60b3b683840a7074110831bcbaa16a40f0eb;hp=26967136cf18d6f03bd0fac52e19d542367e4448;hpb=83fd6b61a6e092a22d4d5e59ed95f05f5e287f11;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 2696713..a79bcc1 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -50,14 +50,9 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
     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);
     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
@@ -94,6 +89,7 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
     fs->flushd_cond = g_cond_new();
     fs->locations = g_hash_table_new(bluesky_cloudlog_hash,
                                      bluesky_cloudlog_equal);
+    fs->inode_map = g_sequence_new(NULL);
 
     fs->log_state = g_new0(BlueSkyCloudLogState, 1);
     fs->log_state->data = g_string_new("");
@@ -109,6 +105,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
         if (fs != NULL) {
             fs->store = store;
             fs->log = bluesky_log_new("journal");
+            fs->log->fs = fs;
             g_print("Loaded filesystem superblock\n");
             g_free(fs->name);
             fs->name = g_strdup(name);
@@ -121,6 +118,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
     BlueSkyFS *fs = bluesky_new_fs(name);
     fs->store = store;
     fs->log = bluesky_log_new("journal");
+    fs->log->fs = fs;
 
     BlueSkyInode *root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs,
                                            BLUESKY_DIRECTORY);
@@ -318,6 +316,13 @@ void bluesky_inode_start_sync(BlueSkyInode *inode)
     g_mutex_lock(inode->fs->lock);
     bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
     inode->unlogged_list = NULL;
+
+    /* Since a new version of the inode has been written to the log, also
+     * schedule a future flush of the new data to cloud storage. */
+    bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+    inode->dirty_list = bluesky_list_prepend(&inode->fs->dirty_list, inode);
+    inode->change_cloud = inode->change_count;
+
     g_mutex_unlock(inode->fs->lock);
 }