Include file reorganization.

diff --git a/bluesky/bluesky-private.h b/bluesky/bluesky-private.h
index 35616d7..a450085 100644 (file)
--- a/bluesky/bluesky-private.h
+++ b/bluesky/bluesky-private.h
@@ -19,8 +19,16 @@
 extern "C" {
 #endif
 
+/* TODO: Make this go away entirely. */
 BlueSkyFS *bluesky_new_fs(gchar *name);
 
+/* Serialization and deserialization of filesystem data for storing to
+ * persistent storage. */
+void bluesky_serialize_superblock(GString *out, BlueSkyFS *fs);
+BlueSkyFS *bluesky_deserialize_superblock(const gchar *buf);
+void bluesky_serialize_inode(GString *out, BlueSkyInode *inode);
+BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/bluesky/bluesky.h b/bluesky/bluesky.h
index 6f919f4..140310b 100644 (file)
--- a/bluesky/bluesky.h
+++ b/bluesky/bluesky.h
@@ -200,7 +200,6 @@ BlueSkyInode *bluesky_get_inode(BlueSkyFS *fs, uint64_t inum);
 void bluesky_insert_inode(BlueSkyFS *fs, BlueSkyInode *inode);
 
 void bluesky_dirent_destroy(gpointer dirent);
-uint64_t bluesky_directory_hash(gchar *name);
 uint64_t bluesky_directory_lookup(BlueSkyInode *inode, gchar *name);
 uint64_t bluesky_directory_ilookup(BlueSkyInode *inode, gchar *name);
 gboolean bluesky_directory_insert(BlueSkyInode *dir, const gchar *name,
@@ -219,11 +218,6 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
 void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode);
 void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum);
 
-void bluesky_serialize_superblock(GString *out, BlueSkyFS *fs);
-BlueSkyFS *bluesky_deserialize_superblock(const gchar *buf);
-void bluesky_serialize_inode(GString *out, BlueSkyInode *inode);
-BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf);
-
 gint bluesky_dirent_compare(gconstpointer a, gconstpointer b,
                             gpointer unused);