X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=f3b804dc4e7f5378b08227b8ad22d8a7a5545f64;hb=ddaec40a37a5e65e53546b14632b1b0b35613264;hp=a76b4b97e8ab8a8a09baff6d17132763071670de;hpb=f2586554fd55cd3cc1be65ac33d1122d00372133;p=bluesky.git diff --git a/bluesky/inode.c b/bluesky/inode.c index a76b4b9..f3b804d 100644 --- a/bluesky/inode.c +++ b/bluesky/inode.c @@ -292,31 +292,11 @@ void bluesky_insert_inode(BlueSkyFS *fs, BlueSkyInode *inode) void bluesky_inode_start_sync(BlueSkyInode *inode) { GList *log_items = NULL; - BlueSkyFS *fs = inode->fs; if (inode->type == BLUESKY_REGULAR) bluesky_file_flush(inode, &log_items); - GString *buf = g_string_new(""); - bluesky_serialize_inode(buf, inode); - - char key[64]; - sprintf(key, "inode-%016"PRIx64, inode->inum); - - BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs); - cloudlog->type = LOGTYPE_INODE; - cloudlog->inum = inode->inum; - cloudlog->data = bluesky_string_new_from_gstring(buf); - - if (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_REF) { - BlueSkyCloudID id = b->ref->id; - g_array_append_val(cloudlog->pointers, id); - } - } - } + BlueSkyCloudLog *cloudlog = bluesky_serialize_inode(inode); bluesky_cloudlog_unref(inode->committed_item); inode->committed_item = cloudlog; @@ -324,7 +304,6 @@ void bluesky_inode_start_sync(BlueSkyInode *inode) bluesky_cloudlog_sync(cloudlog); bluesky_cloudlog_ref(cloudlog); log_items = g_list_prepend(log_items, cloudlog); - bluesky_cloudlog_insert(cloudlog); /* Wait for all log items to be committed to disk. */ bluesky_log_finish_all(log_items); @@ -333,8 +312,8 @@ void bluesky_inode_start_sync(BlueSkyInode *inode) inode->change_commit = inode->change_count; inode->change_time = 0; g_mutex_lock(inode->fs->lock); - bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list); - inode->dirty_list = NULL; + bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list); + inode->unlogged_list = NULL; g_mutex_unlock(inode->fs->lock); }