X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=2df979eeb2adfa30b2fbc9d667317126bbc432f6;hb=579ee9ab24b7cd3981d927f69ae919dcfaeac5ff;hp=ae49d71f7dc8ed8fa60ba763f92be20a5e1abd80;hpb=e1cac3d9a3fe157e0e874225bb85b57e86e1a020;p=bluesky.git

diff --git a/bluesky/file.c b/bluesky/file.c
index ae49d71..2df979e 100644
--- a/bluesky/file.c
+++ b/bluesky/file.c
@@ -71,7 +71,8 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size)
                                              inode->blocks->len - 1);
 
             if (b->type != BLUESKY_BLOCK_ZERO
-                    && b->data->len < BLUESKY_BLOCK_SIZE) {
+                    && (b->type == BLUESKY_BLOCK_REF
+                        || b->data->len < BLUESKY_BLOCK_SIZE)) {
                 bluesky_block_touch(inode, inode->blocks->len - 1);
                 gsize old_size = b->data->len;
                 bluesky_string_resize(b->data, BLUESKY_BLOCK_SIZE);
@@ -206,7 +207,7 @@ void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block,
     BlueSkyRCStr *data = block->data;
 
     GChecksum *csum = g_checksum_new(G_CHECKSUM_SHA256);
-    g_checksum_update(csum, data->data, data->len);
+    g_checksum_update(csum, (const guchar *)data->data, data->len);
     gchar *name = g_strdup(g_checksum_get_string(csum));
 
     /* Store the file data asynchronously, and don't bother waiting for a
@@ -243,3 +244,22 @@ void bluesky_file_flush(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
         bluesky_block_flush(inode->fs, b, barrier);
     }
 }
+
+/* Drop clean data blocks for a file from cache. */
+void bluesky_file_drop_cached(BlueSkyInode *inode)
+{
+    g_return_if_fail(inode->type == BLUESKY_REGULAR);
+
+    for (int i = 0; i < inode->blocks->len; i++) {
+        BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
+        if (b->type == BLUESKY_BLOCK_CACHED) {
+            g_log("bluesky/cache", G_LOG_LEVEL_DEBUG,
+                  "Dropping block %d of inode %"PRIu64" from cache",
+                  i, inode->inum);
+
+            bluesky_string_unref(b->data);
+            b->data = NULL;
+            b->type = BLUESKY_BLOCK_REF;
+        }
+    }
+}