From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Fri, 18 Mar 2011 08:31:28 +0000 (-0700)
Subject: Yet another cleaner bugfix.
X-Git-Url: https://git.vrable.net/?a=commitdiff_plain;h=2dc3639e4e8d1efee451d1e29b51a09b9c3bdc91;p=bluesky.git

Yet another cleaner bugfix.
---

diff --git a/bluesky/cleaner.c b/bluesky/cleaner.c
index be0ab6a..a892e72 100644
--- a/bluesky/cleaner.c
+++ b/bluesky/cleaner.c
@@ -303,6 +303,12 @@ void bluesky_cleaner_merge(BlueSkyFS *fs)
         return;
     }
 
+    if (checkpoint->type != LOGTYPE_CHECKPOINT) {
+        g_warning("Last cleaner object not a checkpoint; cleaning probably in progress.");
+        bluesky_cleaner_item_free(checkpoint);
+        return;
+    }
+
     /* Iterate over each of the inode map sections in the checkpoint */
     for (int i = 0; i < checkpoint->links->len; i++) {
         BlueSkyCleanerLink *link = &g_array_index(checkpoint->links,