X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=57193dd9ee69fefdc3595a6a1df1c27c2990aabe;hb=ed6f1f04bd4d7a73ed26b3bb0d5e0df1cc0acf42;hp=4824dd842bdfb991e49c591f3b34d43ffbce192f;hpb=8ec7f79f834ff8c3493b1bbdd63314d276786aa4;p=bluesky.git

diff --git a/bluesky/file.c b/bluesky/file.c
index 4824dd8..57193dd 100644
--- a/bluesky/file.c
+++ b/bluesky/file.c
@@ -219,52 +219,19 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
     }
 }
 
-#if 0
-/* Read the given block from cloud-backed storage if the data is not already
- * cached. */
-static void block_fetch_completion(BlueSkyStoreAsync *async, gpointer data)
-{
-    BlueSkyBlock *block = (BlueSkyBlock *)data;
-
-    bluesky_string_unref(block->data);
-    block->data = async->data;
-    bluesky_string_ref(block->data);
-
-    if (block->data == NULL) {
-        g_warning("Failed to fetch data block from store!\n");
-        block->data = bluesky_string_new(g_malloc0(BLUESKY_BLOCK_SIZE),
-                                         BLUESKY_BLOCK_SIZE);
-    }
-
-    block->type = BLUESKY_BLOCK_CACHED;
-}
-#endif
-
 void bluesky_block_fetch(BlueSkyInode *inode, BlueSkyBlock *block,
                          BlueSkyStoreAsync *barrier)
 {
-    // TODO: Implement this
-
-#if 0
-    BlueSkyFS *fs = inode->fs;
-
     if (block->type != BLUESKY_BLOCK_REF)
         return;
 
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_GET;
-    async->key = g_strdup(block->ref);
-    bluesky_store_async_add_notifier(async, (GFunc)block_fetch_completion, block);
-    bluesky_store_async_submit(async);
-
-    if (barrier != NULL)
-        bluesky_store_add_barrier(barrier, async);
-    else
-        bluesky_store_async_wait(async);
-
-    bluesky_store_async_unref(async);
-    g_atomic_int_add(&fs->cache_total, 1);
-#endif
+    g_mutex_lock(block->cloudref->lock);
+    bluesky_cloudlog_fetch(block->cloudref);
+    block->data = block->cloudref->data;
+    bluesky_string_ref(block->data);
+    g_mutex_unlock(block->cloudref->lock);
+    block->type = BLUESKY_BLOCK_CACHED;
+    g_atomic_int_add(&inode->fs->cache_total, 1);
 }
 
 /* Write the given block to cloud-backed storage and mark it clean. */
@@ -311,7 +278,6 @@ void bluesky_file_flush(BlueSkyInode *inode, GList **log_items)
 /* Drop clean data blocks for a file from cache. */
 void bluesky_file_drop_cached(BlueSkyInode *inode)
 {
-#if 0
     g_return_if_fail(inode->type == BLUESKY_REGULAR);
 
     for (int i = 0; i < inode->blocks->len; i++) {
@@ -329,7 +295,12 @@ void bluesky_file_drop_cached(BlueSkyInode *inode)
             b->data = NULL;
             b->type = BLUESKY_BLOCK_REF;
             g_atomic_int_add(&inode->fs->cache_total, -1);
+            g_mutex_lock(b->cloudref->lock);
+            if (b->cloudref->location_flags & CLOUDLOG_JOURNAL) {
+                bluesky_string_unref(b->cloudref->data);
+                b->cloudref->data = NULL;
+            }
+            g_mutex_unlock(b->cloudref->lock);
         }
     }
-#endif
 }