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:
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;
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. */