From 10b9087b14d96e6d7f2d14788668bdc346c383ad Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@canonware.com>
Date: Sun, 5 Jun 2016 23:24:52 -0700
Subject: [PATCH] Set 'committed' in extent_[de]commit_wrapper().

---
 src/extent.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/extent.c b/src/extent.c
index 841afa42..51a47644 100644
--- a/src/extent.c
+++ b/src/extent.c
@@ -807,10 +807,8 @@ extent_dalloc_wrapper(tsdn_t *tsdn, arena_t *arena,
 	extent_reregister(tsdn, extent);
 	/* Try to decommit; purge if that fails. */
 	if (extent_committed_get(extent)) {
-		extent_committed_set(extent,
-		    (*r_extent_hooks)->decommit(*r_extent_hooks,
-		    extent_base_get(extent), extent_size_get(extent), 0,
-		    extent_size_get(extent), arena->ind));
+		extent_decommit_wrapper(tsdn, arena, r_extent_hooks, extent,
+		    0, extent_size_get(extent));
 	}
 	extent_zeroed_set(extent, !extent_committed_get(extent) ||
 	    !(*r_extent_hooks)->purge(*r_extent_hooks, extent_base_get(extent),
@@ -839,11 +837,14 @@ extent_commit_wrapper(tsdn_t *tsdn, arena_t *arena,
     extent_hooks_t **r_extent_hooks, extent_t *extent, size_t offset,
     size_t length)
 {
+	bool err;
 
 	extent_hooks_assure_initialized(arena, r_extent_hooks);
-	return ((*r_extent_hooks)->commit(*r_extent_hooks,
+	err = (*r_extent_hooks)->commit(*r_extent_hooks,
 	    extent_base_get(extent), extent_size_get(extent), offset, length,
-	    arena->ind));
+	    arena->ind);
+	extent_committed_set(extent, extent_committed_get(extent) || !err);
+	return (err);
 }
 
 static bool
@@ -862,11 +863,15 @@ extent_decommit_wrapper(tsdn_t *tsdn, arena_t *arena,
     extent_hooks_t **r_extent_hooks, extent_t *extent, size_t offset,
     size_t length)
 {
+	bool err;
 
 	extent_hooks_assure_initialized(arena, r_extent_hooks);
-	return ((*r_extent_hooks)->decommit(*r_extent_hooks,
+
+	err = (*r_extent_hooks)->decommit(*r_extent_hooks,
 	    extent_base_get(extent), extent_size_get(extent), offset, length,
-	    arena->ind));
+	    arena->ind);
+	extent_committed_set(extent, extent_committed_get(extent) && err);
+	return (err);
 }
 
 static bool