Try to clean up the locking for LRU lists.

[bluesky.git] / bluesky / inode.c

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 1c89c29..ee63820 100644 (file)
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -342,12 +342,15 @@ 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);
 
@@ -366,7 +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);
-    i->change_count = 0;
+    inode->change_count = 0;
     bluesky_inode_ref(inode);       // Extra ref held by fetching process
     g_mutex_lock(inode->lock);
     bluesky_insert_inode(fs, inode);