Implement multi-threaded request processing and locking for NFS.

[bluesky.git] / bluesky / file.c

diff --git a/bluesky/file.c b/bluesky/file.c
index ae49d71..9b9f916 100644 (file)
--- 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