Remove an extraneous mutex unlock.

[bluesky.git] / bluesky / bluesky-private.h

diff --git a/bluesky/bluesky-private.h b/bluesky/bluesky-private.h
index 85eb99c..61238eb 100644 (file)
--- a/bluesky/bluesky-private.h
+++ b/bluesky/bluesky-private.h
@@ -213,6 +213,8 @@ struct log_footer {
 
 struct cloudlog_header {
     char magic[4];
+    uint8_t crypt_auth[CRYPTO_HASH_SIZE];
+    uint8_t crypt_iv[CRYPTO_BLOCK_SIZE];
     uint8_t type;
     BlueSkyCloudID id;
     uint64_t inum;
@@ -284,11 +286,15 @@ guint bluesky_cloudlog_hash(gconstpointer a);
 BlueSkyCloudLog *bluesky_cloudlog_new(BlueSkyFS *fs, const BlueSkyCloudID *id);
 gchar *bluesky_cloudlog_id_to_string(BlueSkyCloudID id);
 BlueSkyCloudID bluesky_cloudlog_id_from_string(const gchar *idstr);
+void bluesky_cloudlog_threads_init(BlueSkyFS *fs);
 void bluesky_cloudlog_ref(BlueSkyCloudLog *log);
 void bluesky_cloudlog_unref(BlueSkyCloudLog *log);
+void bluesky_cloudlog_unref_delayed(BlueSkyCloudLog *log);
+void bluesky_cloudlog_erase(BlueSkyCloudLog *log);
 void bluesky_cloudlog_stats_update(BlueSkyCloudLog *log, int type);
 void bluesky_cloudlog_sync(BlueSkyCloudLog *log);
 void bluesky_cloudlog_insert(BlueSkyCloudLog *log);
+void bluesky_cloudlog_insert_locked(BlueSkyCloudLog *log);
 BlueSkyCloudLog *bluesky_cloudlog_get(BlueSkyFS *fs, BlueSkyCloudID id);
 void bluesky_cloudlog_fetch(BlueSkyCloudLog *log);
 BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
@@ -379,14 +385,9 @@ typedef struct {
 typedef struct {
     uint64_t inum;
 
-    /* The ID of the most recent version of the inode. */
-    BlueSkyCloudID id;
-
-    /* The location where that version is written in the cloud. */
-    BlueSkyCloudPointer location;
-
-    /* If the cloud log entry exists in memory, then a pointer to it, otherwise
-     * NULL. */
+    /* A pointer to the cloud log entry for this inode.  This may or may not
+     * actually have data loaded (it might just contain pointers to the data
+     * location, and in fact this will likely often be the case). */
     BlueSkyCloudLog *item;
 } InodeMapEntry;
 
@@ -408,6 +409,7 @@ typedef struct {
 InodeMapEntry *bluesky_inode_map_lookup(GSequence *inode_map, uint64_t inum,
                                         int action);
 BlueSkyCloudLog *bluesky_inode_map_serialize(BlueSkyFS *fs);
+void bluesky_inode_map_minimize(BlueSkyFS *fs);
 
 gboolean bluesky_checkpoint_load(BlueSkyFS *fs);