In-progress work on better cache flushing.

[bluesky.git] / bluesky / cache.c

diff --git a/bluesky/cache.c b/bluesky/cache.c
index 481390f..211c2b9 100644 (file)
--- a/bluesky/cache.c
+++ b/bluesky/cache.c
@@ -28,10 +28,14 @@ static void writeback_complete(gpointer a, gpointer i)
     g_mutex_lock(inode->lock);
 
     inode->change_commit = inode->change_pending;
+    inode->change_pending = 0;
     if (inode->change_count == inode->change_commit) {
         /* If inode is no longer dirty... */
         inode->change_time = 0;
-        inode->change_pending = 0;
+        g_mutex_lock(inode->fs->lock);
+        bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+        inode->dirty_list = NULL;
+        g_mutex_unlock(inode->fs->lock);
     }
 
     g_mutex_unlock(inode->lock);
@@ -58,15 +62,24 @@ static void flushd_inode(gpointer value, gpointer user_data)
             drop_caches(inode);
 
             /* If the only references are the one we hold and the one in the
-             * filesystem inum->inode hash table...  The check for a refcount
-             * of 2 shouldn't be necessary so it should be okay if there is a
-             * race on the check. */
+             * filesystem inum->inode hash table...  First check the refcount
+             * without the lock for speed, but if the check looks good verify
+             * it after taking the filesystem lock. */
             if (inode->refcount == 2) {
-                g_log("bluesky/flushd", G_LOG_LEVEL_DEBUG,
-                      "Trying to drop inode %"PRIu64" from cache", inode->inum);
                 g_mutex_lock(fs->lock);
-                if (g_hash_table_remove(fs->inodes, &inode->inum))
-                    bluesky_inode_unref(inode);
+                if (inode->refcount == 2) {
+                    g_log("bluesky/flushd", G_LOG_LEVEL_DEBUG,
+                          "Trying to drop inode %"PRIu64" from cache",
+                          inode->inum);
+                    if (g_hash_table_remove(fs->inodes, &inode->inum))
+                        bluesky_inode_unref(inode);
+                }
+                bluesky_list_unlink(&inode->fs->accessed_list,
+                                    inode->accessed_list);
+                inode->accessed_list = NULL;
+                bluesky_list_unlink(&inode->fs->dirty_list,
+                                    inode->dirty_list);
+                inode->dirty_list = NULL;
                 g_mutex_unlock(fs->lock);
             }
         }