X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=9b6160a6c7aa35ea78385730493c2df3edd088d6;hb=50c08ba526a6638e8e3c4eec0503365a2c110a85;hp=438e59fadb82b480303d1a6ea6ee9dc097e38014;hpb=0ef7fc934daee6ded318e3d52023521b758b295e;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 438e59f..9b6160a 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -29,7 +29,8 @@ int64_t bluesky_get_current_time()
 
 /* Update an inode to indicate that a modification was made.  This increases
  * the change counter, updates the ctime to the current time, and optionally
- * updates the mtime.  inode must already be locked. */
+ * updates the mtime.  This also makes the inode contents subject to writeback
+ * to storage in the future.  inode must already be locked. */
 void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
 {
     int64_t now = bluesky_get_current_time();
@@ -40,6 +41,9 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
 
     if (inode->change_time == 0)
         inode->change_time = now;
+
+    if (bluesky_options.writethrough_cache)
+        bluesky_file_flush(inode, NULL);
 }
 
 /* Unfortunately a glib hash table is only guaranteed to be able to store
@@ -144,6 +148,7 @@ BlueSkyInode *bluesky_new_inode(uint64_t inum, BlueSkyFS *fs,
     i->type = type;
     i->fs = fs;
     i->inum = inum;
+    i->change_count = 1;
 
     switch (type) {
     case BLUESKY_REGULAR:
@@ -167,8 +172,8 @@ BlueSkyInode *bluesky_new_inode(uint64_t inum, BlueSkyFS *fs,
 
 /* Retrieve an inode from the filesystem.  Eventually this will be a cache and
  * so we might need to go fetch the inode from elsewhere; for now all
- * filesystem state is stored here.  inode is returned locked with a reference
- * held. */
+ * filesystem state is stored here.  inode is returned with a reference held
+ * but not locked. */
 BlueSkyInode *bluesky_get_inode(BlueSkyFS *fs, uint64_t inum)
 {
     BlueSkyInode *inode = NULL;
@@ -219,12 +224,17 @@ void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode)
 }
 
 /* Start writeback of an inode and all associated data. */
-void bluesky_inode_start_sync(BlueSkyInode *inode)
+void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
 {
+    BlueSkyFS *fs = inode->fs;
+
     GString *buf = g_string_new("");
     bluesky_serialize_inode(buf, inode);
     BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
 
+    if (inode->type == BLUESKY_REGULAR)
+        bluesky_file_flush(inode, barrier);
+
     char key[64];
     sprintf(key, "inode-%016"PRIx64, inode->inum);
 
@@ -233,6 +243,8 @@ void bluesky_inode_start_sync(BlueSkyInode *inode)
     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);
 }