X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=ee63820b96a42ca5c05d8fdc765bc53bb5cc861f;hb=80b412586b3cf15eb5877be8d3e96eb757281b8a;hp=3e92e4f2a7f75f508978081117f52fd3e88fc065;hpb=5b3aafc6c34c798f9ad74539f24c9b278e820163;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 3e92e4f..ee63820 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -44,6 +44,13 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
 
     if (bluesky_options.writethrough_cache)
         bluesky_file_flush(inode, NULL);
+
+    g_mutex_lock(inode->fs->lock);
+    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);
 }
 
 /* Unfortunately a glib hash table is only guaranteed to be able to store
@@ -76,6 +83,7 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
                                   bluesky_fs_key_equal_func);
     fs->next_inum = BLUESKY_ROOT_INUM + 1;
     fs->store = bluesky_store_new("file");
+    fs->flushd_lock = g_mutex_new();
 
     return fs;
 }
@@ -104,6 +112,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
     root->nlink = 1;
     root->mode = 0755;
     bluesky_insert_inode(fs, root);
+    bluesky_inode_update_ctime(root, TRUE);
 
     bluesky_inode_flush(fs, root);
     bluesky_superblock_flush(fs);
@@ -124,10 +133,20 @@ void bluesky_inode_unref(BlueSkyInode *inode)
                 inode->inum);
 
         /* Sanity check: Is the inode clean? */
-        if (inode->change_commit < inode->change_count) {
-            g_warning("Dropping inode which is not clean (commit %"PRIi64" < change %"PRIi64")\n", inode->change_commit, inode->change_count);
+        if (inode->change_commit < inode->change_count
+                || inode->accessed_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);
         }
 
+        /* These shouldn't be needed, but in case the above warning fires and
+         * we delete the inode anyway, we ought to be sure the inode is not on
+         * any LRU list. */
+        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);
+        g_mutex_unlock(inode->fs->lock);
+
         /* Free file type specific data.  It should be an error for there to be
          * dirty data to commit when the reference count has reaches zero. */
         switch (inode->type) {
@@ -323,11 +342,17 @@ static void complete_inode_fetch(BlueSkyStoreAsync *async, BlueSkyInode *inode)
         g_print("    failed to load inode, cleaning up\n");
         g_mutex_lock(inode->fs->lock);
         g_hash_table_remove(inode->fs->inodes, &inode->inum);
+        bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
+        inode->accessed_list = NULL;
         g_mutex_unlock(inode->fs->lock);
         bluesky_inode_unref(inode);
     }
 
     inode->access_time = bluesky_get_current_time();
+    g_mutex_lock(inode->fs->lock);
+    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);
 
     g_mutex_unlock(inode->lock);
     bluesky_inode_unref(inode);
@@ -344,6 +369,7 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
     sprintf(key, "inode-%016"PRIx64, inum);
 
     BlueSkyInode *inode = bluesky_new_inode(inum, fs, BLUESKY_PENDING);
+    inode->change_count = 0;
     bluesky_inode_ref(inode);       // Extra ref held by fetching process
     g_mutex_lock(inode->lock);
     bluesky_insert_inode(fs, inode);