X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=a052fb4b04b853532011432c7b1c56efca4da7dc;hb=d514caf49faff9295d0e497d3b6b8856fe83f8d0;hp=377364c678fe68367764af3bbe589c75a43f9fe7;hpb=0e3a9c0defb08f388fea2c2eb393dd39d9e95e45;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 377364c..a052fb4 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -138,16 +138,12 @@ uint64_t bluesky_fs_alloc_inode(BlueSkyFS *fs)
     return inum;
 }
 
-BlueSkyInode *bluesky_new_inode(uint64_t inum, BlueSkyFS *fs,
-                                BlueSkyFileType type)
+/* Perform type-specification initialization of an inode.  Normally performed
+ * in bluesky_new_inode, but can be separated if an inode is created first,
+ * then deserialized. */
+void bluesky_init_inode(BlueSkyInode *i, BlueSkyFileType type)
 {
-    BlueSkyInode *i = g_new0(BlueSkyInode, 1);
-
-    i->lock = g_mutex_new();
-    i->refcount = 1;
     i->type = type;
-    i->fs = fs;
-    i->inum = inum;
 
     switch (type) {
     case BLUESKY_REGULAR:
@@ -158,21 +154,30 @@ BlueSkyInode *bluesky_new_inode(uint64_t inum, BlueSkyFS *fs,
         i->dirhash = g_hash_table_new(g_str_hash, g_str_equal);
         i->dirhash_folded = g_hash_table_new(g_str_hash, g_str_equal);
         break;
-    case BLUESKY_BLOCK:
-    case BLUESKY_CHARACTER:
-    case BLUESKY_SYMLINK:
-    case BLUESKY_SOCKET:
-    case BLUESKY_FIFO:
+    default:
         break;
     }
+}
+
+BlueSkyInode *bluesky_new_inode(uint64_t inum, BlueSkyFS *fs,
+                                BlueSkyFileType type)
+{
+    BlueSkyInode *i = g_new0(BlueSkyInode, 1);
+
+    i->lock = g_mutex_new();
+    i->refcount = 1;
+    i->fs = fs;
+    i->inum = inum;
+    i->change_count = 1;
+    bluesky_init_inode(i, type);
 
     return i;
 }
 
 /* Retrieve an inode from the filesystem.  Eventually this will be a cache and
  * so we might need to go fetch the inode from elsewhere; for now all
- * filesystem state is stored here.  inode is returned locked with a reference
- * held. */
+ * filesystem state is stored here.  inode is returned with a reference held
+ * but not locked. */
 BlueSkyInode *bluesky_get_inode(BlueSkyFS *fs, uint64_t inum)
 {
     BlueSkyInode *inode = NULL;
@@ -256,10 +261,18 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
     if (data == NULL)
         return;
 
-    BlueSkyInode *inode = bluesky_deserialize_inode(fs, data->data);
-    if (inode != NULL) {
-        bluesky_insert_inode(fs, inode);
+    BlueSkyInode *inode = bluesky_new_inode(inum, fs, BLUESKY_PENDING);
+    bluesky_inode_ref(inode);
+    g_mutex_lock(inode->lock);
+    bluesky_insert_inode(fs, inode);
+
+    if (!bluesky_deserialize_inode(inode, data->data)) {
+        g_hash_table_remove(fs->inodes, &inode->inum);
+        bluesky_inode_unref(inode);
     }
+
+    g_mutex_unlock(inode->lock);
+    bluesky_inode_unref(inode);
 }
 
 /* Synchronize filesystem superblock to stable storage. */