}
/* Start writeback of an inode and all associated data. */
-void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
+void bluesky_inode_start_sync(BlueSkyInode *inode)
{
GList *log_items = NULL;
BlueSkyFS *fs = inode->fs;
if (inode->type == BLUESKY_REGULAR)
- bluesky_file_flush(inode, barrier, &log_items);
+ bluesky_file_flush(inode, &log_items);
GString *buf = g_string_new("");
bluesky_serialize_inode(buf, inode);
}
}
- log_items = g_list_prepend(log_items, bluesky_cloudlog_sync(cloudlog));
-
+ bluesky_cloudlog_sync(cloudlog);
+ log_items = g_list_prepend(log_items, cloudlog);
bluesky_cloudlog_insert(cloudlog);
/* Wait for all log items to be committed to disk. */
- while (log_items != NULL) {
- BlueSkyLogItem *log_item = (BlueSkyLogItem *)log_items->data;
- bluesky_log_item_finish(log_item);
- log_items = g_list_delete_link(log_items, log_items);
- }
-
- BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
- async->op = STORE_OP_PUT;
- async->key = g_strdup(key);
- async->data = data;
- bluesky_store_async_submit(async);
- if (barrier != NULL)
- bluesky_store_add_barrier(barrier, async);
- bluesky_store_async_unref(async);
+ bluesky_log_finish_all(log_items);
}
/* Write back an inode and all associated data and wait for completion. Inode
* should already be locked. */
void bluesky_inode_do_sync(BlueSkyInode *inode)
{
- BlueSkyStoreAsync *barrier = bluesky_store_async_new(inode->fs->store);
- barrier->op = STORE_OP_BARRIER;
-
if (bluesky_verbose) {
g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
"Synchronous writeback for inode %"PRIu64"...", inode->inum);
}
- bluesky_inode_start_sync(inode, barrier);
- bluesky_store_async_submit(barrier);
- bluesky_store_async_wait(barrier);
- bluesky_store_async_unref(barrier);
+ bluesky_inode_start_sync(inode);
if (bluesky_verbose) {
g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
"Writeback for inode %"PRIu64" complete", inode->inum);