1 files changed, 25 insertions, 28 deletions

diff --git a/src/btree/bt_discard.c b/src/btree/bt_discard.c
index 1181d92609f..9807d5bc88f 100644
--- a/src/btree/bt_discard.c
+++ b/src/btree/bt_discard.c
@@ -40,7 +40,6 @@ __wt_ref_out(WT_SESSION_IMPL *session, WT_REF *ref)
 void
 __wt_page_out(WT_SESSION_IMPL *session, WT_PAGE **pagep)
 {
-	WT_FH *fh;
 	WT_PAGE *page;
 	WT_PAGE_HEADER *dsk;
 	WT_PAGE_MODIFY *mod;
@@ -134,10 +133,11 @@ __wt_page_out(WT_SESSION_IMPL *session, WT_PAGE **pagep)
 	dsk = (WT_PAGE_HEADER *)page->dsk;
 	if (F_ISSET_ATOMIC(page, WT_PAGE_DISK_ALLOC))
 		__wt_overwrite_and_free_len(session, dsk, dsk->mem_size);
-	if (F_ISSET_ATOMIC(page, WT_PAGE_DISK_MAPPED)) {
-		fh = S2BT(session)->bm->block->fh;
-		(void)fh->fh_map_discard(session, fh, dsk, dsk->mem_size);
-	}
+
+	/* Discard any mapped image. */
+	if (F_ISSET_ATOMIC(page, WT_PAGE_DISK_MAPPED))
+		(void)S2BT(session)->bm->map_discard(
+		    S2BT(session)->bm, session, dsk, (size_t)dsk->mem_size);
 
 	__wt_overwrite_and_free(session, page);
 }
@@ -194,16 +194,33 @@ __free_page_modify(WT_SESSION_IMPL *session, WT_PAGE *page)
 			__free_skip_list(
 			    session, WT_SKIP_FIRST(append), update_ignore);
 			__wt_free(session, append);
-			__wt_free(session, mod->mod_append);
+			__wt_free(session, mod->mod_col_append);
 		}
 
 		/* Free the insert/update array. */
-		if (mod->mod_update != NULL)
-			__free_skip_array(session, mod->mod_update,
+		if (mod->mod_col_update != NULL)
+			__free_skip_array(session, mod->mod_col_update,
 			    page->type ==
 			    WT_PAGE_COL_FIX ? 1 : page->pg_var_entries,
 			    update_ignore);
 		break;
+	case WT_PAGE_ROW_LEAF:
+		/*
+		 * Free the insert array.
+		 *
+		 * Row-store tables have one additional slot in the insert array
+		 * (the insert array has an extra slot to hold keys that sort
+		 * before keys found on the original page).
+		 */
+		if (mod->mod_row_insert != NULL)
+			__free_skip_array(session, mod->mod_row_insert,
+			    page->pg_row_entries + 1, update_ignore);
+
+		/* Free the update array. */
+		if (mod->mod_row_update != NULL)
+			__free_update(session, mod->mod_row_update,
+			    page->pg_row_entries, update_ignore);
+		break;
 	}
 
 	/* Free the overflow on-page, reuse and transaction-cache skiplists. */
@@ -324,10 +341,6 @@ __free_page_row_leaf(WT_SESSION_IMPL *session, WT_PAGE *page)
 	WT_ROW *rip;
 	uint32_t i;
 	void *copy;
-	bool update_ignore;
-
-	/* In some failed-split cases, we can't discard updates. */
-	update_ignore = F_ISSET_ATOMIC(page, WT_PAGE_UPDATE_IGNORE);
 
 	/*
 	 * Free the in-memory index array.
@@ -342,22 +355,6 @@ __free_page_row_leaf(WT_SESSION_IMPL *session, WT_PAGE *page)
 		    page, copy, &ikey, NULL, NULL, NULL);
 		__wt_free(session, ikey);
 	}
-
-	/*
-	 * Free the insert array.
-	 *
-	 * Row-store tables have one additional slot in the insert array (the
-	 * insert array has an extra slot to hold keys that sort before keys
-	 * found on the original page).
-	 */
-	if (page->pg_row_ins != NULL)
-		__free_skip_array(session,
-		    page->pg_row_ins, page->pg_row_entries + 1, update_ignore);
-
-	/* Free the update array. */
-	if (page->pg_row_upd != NULL)
-		__free_update(session,
-		    page->pg_row_upd, page->pg_row_entries, update_ignore);
 }
 
 /*