Merge branch 'develop'

19 files changed, 191 insertions, 84 deletions

diff --git a/.hgtags b/.hgtags
index 4f2ad7b0a46..8467945d0c6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -8,3 +8,4 @@ a792d468bedd7b37be9cfff545582ae8ff54ff6f 1.1.3
 8054de4cb42988cd54b395cc834a6f8ab25298f7 1.1.4
 ef844093bec2ac38945fd04487dc3a051f4b9136 1.1.5
 12cf1d5546df25ac323f0400d4764e67ad5802e2 1.2.0
+9046bcab74eba90a2cb05af28026ec4a74e4fb9c 1.2.1
diff --git a/NEWS b/NEWS
index dddee97e890..ee85efe14b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+WiredTiger release 1.2.1, 2012-06-15
+------------------------------------
+
+This is a bugfix release.  The changes are as follows:
+
+* Avoid a deadlock between eviction and checkpoint on the connection spinlock.
+
+* Allocate "desc" buffers in heap memory so that they are correctly aligned
+  (fixes direct_io support on Linux).
+
+* Initialize the snapshot-avail list after cleaning it out, else we'll try and
+  print a NULL pointer in VERBOSE mode.
+
+
 WiredTiger release 1.2.0, 2012-06-04
 ------------------------------------
 
diff --git a/README b/README
index 16153cf0ef6..1d7c55fdcd7 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-WiredTiger 1.2.0: (June  4, 2012)
+WiredTiger 1.2.1: (June 15, 2012)
 
-This is version 1.2.0 of WiredTiger.
+This is version 1.2.1 of WiredTiger.
 
 WiredTiger documentation can be found at:
 
diff --git a/build_posix/aclocal/version-set.m4 b/build_posix/aclocal/version-set.m4
index 9750cf1547a..6fec543f420 100644
--- a/build_posix/aclocal/version-set.m4
+++ b/build_posix/aclocal/version-set.m4
@@ -2,8 +2,8 @@ dnl build by dist/s_version
 
 VERSION_MAJOR=1
 VERSION_MINOR=2
-VERSION_PATCH=0
-VERSION_STRING='"WiredTiger 1.2.0: (June  4, 2012)"'
+VERSION_PATCH=1
+VERSION_STRING='"WiredTiger 1.2.1: (June 15, 2012)"'
 
 AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
diff --git a/build_posix/aclocal/version.m4 b/build_posix/aclocal/version.m4
index f81807a73e2..024be07fed4 100644
--- a/build_posix/aclocal/version.m4
+++ b/build_posix/aclocal/version.m4
@@ -1,2 +1,2 @@
 dnl WiredTiger product version for AC_INIT.  Maintained by dist/s_version
-1.2.0
+1.2.1
diff --git a/dist/RELEASE b/dist/RELEASE
index 724eb3f7763..34a188021e3 100644
--- a/dist/RELEASE
+++ b/dist/RELEASE
@@ -1,6 +1,6 @@
 WIREDTIGER_VERSION_MAJOR=1
 WIREDTIGER_VERSION_MINOR=2
-WIREDTIGER_VERSION_PATCH=0
+WIREDTIGER_VERSION_PATCH=1
 WIREDTIGER_VERSION="$WIREDTIGER_VERSION_MAJOR.$WIREDTIGER_VERSION_MINOR.$WIREDTIGER_VERSION_PATCH"
 
 WIREDTIGER_RELEASE_DATE=`date "+%B %e, %Y"`
diff --git a/src/block/block_ext.c b/src/block/block_ext.c
index 5d7ae8af45b..b102bc54899 100644
--- a/src/block/block_ext.c
+++ b/src/block/block_ext.c
@@ -397,8 +397,8 @@ __wt_block_extend(
 	fh = block->fh;
 
 	/*
-	 * Callers of this function are expected to be holding any locks
-	 * required to extend the file.
+	 * Callers of this function are expected to have already acquired any
+	 * locks required to extend the file.
 	 *
 	 * We should never be allocating from an empty file.
 	 */
@@ -464,24 +464,26 @@ int
 __wt_block_off_free(
     WT_SESSION_IMPL *session, WT_BLOCK *block, off_t off, off_t size)
 {
-	WT_EXTLIST *el;
+	WT_DECL_RET;
 
 	/*
-	 * Callers of this function are expected to be holding any locks
-	 * required to manipulate the extent lists.
+	 * Callers of this function are expected to have already acquired any
+	 * locks required to manipulate the extent lists.
 	 *
 	 * We can reuse this extent immediately if it was allocated during this
-	 * snapshot,  merge it into the avail list (which slows file growth in
+	 * snapshot, merge it into the avail list (which slows file growth in
 	 * workloads including repeated overflow record modification).  If this
 	 * extent is referenced in a previous snapshot, merge into the discard
 	 * list.
 	 */
-	el = __wt_block_off_remove_overlap(
-	    session, &block->live.alloc, off, size) == 0 ?
-	    &block->live.avail : &block->live.discard;
-	WT_RET(__block_merge(session, el, off, (off_t)size));
-
-	return (0);
+	if ((ret = __wt_block_off_remove_overlap(
+	    session, &block->live.alloc, off, size)) == 0)
+		ret = __block_merge(
+		    session, &block->live.avail, off, (off_t)size);
+	else if (ret == WT_NOTFOUND)
+		ret = __block_merge(
+		    session, &block->live.discard, off, (off_t)size);
+	return (ret);
 }
 
 #ifdef HAVE_DIAGNOSTIC
@@ -771,15 +773,15 @@ __wt_block_insert_ext(
     WT_SESSION_IMPL *session, WT_EXTLIST *el, off_t off, off_t size)
 {
 	/*
-	 * There are currently two copies of this function (this code is a
-	 * one-liner that calls the internal version of the function, which
-	 * means the compiler should compress out the function call).  It's
-	 * that way because the interface is still fluid, I'm not convinced
-	 * there won't be a need for a functional split between the internal
-	 * and external versions in the future.
+	 * There are currently two copies of this function (this code is a one-
+	 * liner that calls the internal version of the function, which means
+	 * the compiler should compress out the function call).  It's that way
+	 * because the interface is still fluid, I'm not convinced there won't
+	 * be a need for a functional split between the internal and external
+	 * versions in the future.
 	 *
-	 * Callers of this function are expected to be holding any locks
-	 * required to manipulate the extent list.
+	 * Callers of this function are expected to have already acquired any
+	 * locks required to manipulate the extent list.
 	 */
 	return (__block_merge(session, el, off, size));
 }
@@ -1052,6 +1054,25 @@ __wt_block_extlist_truncate(
 
 	return (0);
 }
+
+/*
+ * __wt_block_extlist_init --
+ *	Initialize an extent list.
+ */
+int
+__wt_block_extlist_init(WT_SESSION_IMPL *session,
+    WT_EXTLIST *el, const char *name, const char *extname)
+{
+	char buf[128];
+
+	(void)snprintf(buf, sizeof(buf), "%s.%s",
+	    name == NULL ? "" : name, extname == NULL ? "" : extname);
+	WT_RET(__wt_strdup(session, buf, &el->name));
+
+	el->offset = WT_BLOCK_INVALID_OFFSET;
+	return (0);
+}
+
 /*
  * __wt_block_extlist_free --
  *	Discard an extent list.
@@ -1062,19 +1083,19 @@ __wt_block_extlist_free(WT_SESSION_IMPL *session, WT_EXTLIST *el)
 	WT_EXT *ext, *next;
 	WT_SIZE *szp, *nszp;
 
+	__wt_free(session, el->name);
+
 	for (ext = el->off[0]; ext != NULL; ext = next) {
 		next = ext->next[0];
 		__wt_free(session, ext);
 	}
-	memset(el->off, 0, sizeof(el->off));
 	for (szp = el->sz[0]; szp != NULL; szp = nszp) {
 		nszp = szp->next[0];
 		__wt_free(session, szp);
 	}
-	memset(el->sz, 0, sizeof(el->sz));
 
-	el->bytes = 0;
-	el->entries = 0;
+	/* Extent lists are re-used, clear them. */
+	memset(el, 0, sizeof(*el));
 }
 
 #ifdef HAVE_VERBOSE
diff --git a/src/block/block_open.c b/src/block/block_open.c
index 784384119a0..f00e333b735 100644
--- a/src/block/block_open.c
+++ b/src/block/block_open.c
@@ -165,10 +165,14 @@ int
 __wt_desc_init(WT_SESSION_IMPL *session, WT_FH *fh)
 {
 	WT_BLOCK_DESC *desc;
-	uint8_t buf[WT_BLOCK_DESC_SECTOR];
+	WT_DECL_RET;
+	WT_ITEM *buf;
+
+	/* Use a scratch buffer to get correct alignment for direct I/O. */
+	WT_RET(__wt_scr_alloc(session, WT_BLOCK_DESC_SECTOR, &buf));
+	memset(buf->mem, 0, WT_BLOCK_DESC_SECTOR);
 
-	memset(buf, 0, sizeof(buf));
-	desc = (void *)buf;
+	desc = buf->mem;
 	desc->magic = WT_BLOCK_MAGIC;
 	desc->majorv = WT_BLOCK_MAJOR_VERSION;
 	desc->minorv = WT_BLOCK_MINOR_VERSION;
@@ -177,7 +181,10 @@ __wt_desc_init(WT_SESSION_IMPL *session, WT_FH *fh)
 	desc->cksum = 0;
 	desc->cksum = __wt_cksum(desc, WT_BLOCK_DESC_SECTOR);
 
-	return (__wt_write(session, fh, (off_t)0, WT_BLOCK_DESC_SECTOR, desc));
+	ret = __wt_write(session, fh, (off_t)0, WT_BLOCK_DESC_SECTOR, desc);
+
+	__wt_scr_free(&buf);
+	return (ret);
 }
 
 /*
@@ -188,16 +195,19 @@ static int
 __desc_read(WT_SESSION_IMPL *session, WT_BLOCK *block)
 {
 	WT_BLOCK_DESC *desc;
+	WT_DECL_RET;
+	WT_ITEM *buf;
 	uint32_t cksum;
-	uint8_t buf[WT_BLOCK_DESC_SECTOR];
+
+	/* Use a scratch buffer to get correct alignment for direct I/O. */
+	WT_RET(__wt_scr_alloc(session, WT_BLOCK_DESC_SECTOR, &buf));
 
 	/* Read the first sector and verify the file's format. */
-	memset(buf, 0, sizeof(buf));
-	WT_RET(__wt_read(
-	    session, block->fh, (off_t)0, WT_BLOCK_DESC_SECTOR, buf));
+	WT_ERR(__wt_read(
+	    session, block->fh, (off_t)0, WT_BLOCK_DESC_SECTOR, buf->mem));
 
-	desc = (void *)buf;
-	WT_VERBOSE_RET(session, block,
+	desc = buf->mem;
+	WT_VERBOSE_ERR(session, block,
 	    "open: magic %" PRIu32
 	    ", major/minor: %" PRIu32 "/%" PRIu32
 	    ", checksum %#" PRIx32,
@@ -218,16 +228,17 @@ __desc_read(WT_SESSION_IMPL *session, WT_BLOCK *block)
 	desc->cksum = 0;
 	if (desc->magic != WT_BLOCK_MAGIC ||
 	    cksum != __wt_cksum(desc, WT_BLOCK_DESC_SECTOR))
-		WT_RET_MSG(session, WT_ERROR,
+		WT_ERR_MSG(session, WT_ERROR,
 		    "%s does not appear to be a WiredTiger file", block->name);
 
 	if (desc->majorv > WT_BLOCK_MAJOR_VERSION ||
 	    (desc->majorv == WT_BLOCK_MAJOR_VERSION &&
 	    desc->minorv > WT_BLOCK_MINOR_VERSION))
-		WT_RET_MSG(session, WT_ERROR,
+		WT_ERR_MSG(session, WT_ERROR,
 		    "%s is an unsupported version of a WiredTiger file",
 		    block->name);
 
+err:	__wt_scr_free(&buf);
 	return (0);
 }
 
diff --git a/src/block/block_slvg.c b/src/block/block_slvg.c
index 9ecad47173c..0a44731d5aa 100644
--- a/src/block/block_slvg.c
+++ b/src/block/block_slvg.c
@@ -24,7 +24,7 @@ __wt_block_salvage_start(WT_SESSION_IMPL *session, WT_BLOCK *block)
 	 * Salvage creates a new snapshot when it's finished, set up for
 	 * rolling an empty file forward.
 	 */
-	WT_RET(__wt_block_snap_init(session, block, &block->live, 1));
+	WT_RET(__wt_block_snap_init(session, block, &block->live, "live", 1));
 
 	/*
 	 * Truncate the file to an initial sector plus N allocation size
diff --git a/src/block/block_snap.c b/src/block/block_snap.c
index bf67160e460..6f2b1fd9224 100644
--- a/src/block/block_snap.c
+++ b/src/block/block_snap.c
@@ -19,7 +19,7 @@ static int __snapshot_update(WT_SESSION_IMPL *,
  */
 int
 __wt_block_snap_init(WT_SESSION_IMPL *session,
-    WT_BLOCK *block, WT_BLOCK_SNAPSHOT *si, int is_live)
+    WT_BLOCK *block, WT_BLOCK_SNAPSHOT *si, const char *name, int is_live)
 {
 	WT_DECL_RET;
 
@@ -43,16 +43,13 @@ __wt_block_snap_init(WT_SESSION_IMPL *session,
 
 	si->root_offset = WT_BLOCK_INVALID_OFFSET;
 
-	si->alloc.name = "alloc";
-	si->alloc.offset = WT_BLOCK_INVALID_OFFSET;
-
-	si->avail.name = "avail";
-	si->avail.offset = WT_BLOCK_INVALID_OFFSET;
-
-	si->discard.name = "discard";
-	si->discard.offset = WT_BLOCK_INVALID_OFFSET;
+	WT_RET(__wt_block_extlist_init(session, &si->alloc, name, "alloc"));
+	WT_RET(__wt_block_extlist_init(session, &si->avail, name, "avail"));
+	WT_RET(__wt_block_extlist_init(session, &si->discard, name, "discard"));
 
 	si->file_size = WT_BLOCK_DESC_SECTOR;
+	WT_RET(__wt_block_extlist_init(
+	    session, &si->snapshot_avail, name, "snapshot_avail"));
 
 	return (0);
 }
@@ -80,7 +77,7 @@ __wt_block_snapshot_load(WT_SESSION_IMPL *session,
 	dsk->size = 0;
 
 	si = &block->live;
-	WT_RET(__wt_block_snap_init(session, block, si, 1));
+	WT_RET(__wt_block_snap_init(session, block, si, "live", 1));
 
 	if (WT_VERBOSE_ISSET(session, snapshot)) {
 		if (addr != NULL) {
@@ -163,16 +160,25 @@ __wt_block_snapshot_unload(WT_SESSION_IMPL *session, WT_BLOCK *block)
 	if (block->verify)
 		WT_TRET(__wt_verify_snap_unload(session, block, si));
 
+	__wt_block_snap_destroy(session, si);
+
+	block->live_load = 0;
+
+	return (ret);
+}
+
+/*
+ * __wt_block_snap_destroy --
+ *	Clear a snapshot structure.
+ */
+void
+__wt_block_snap_destroy(WT_SESSION_IMPL *session, WT_BLOCK_SNAPSHOT *si)
+{
 	/* Discard the extent lists. */
 	__wt_block_extlist_free(session, &si->alloc);
 	__wt_block_extlist_free(session, &si->avail);
 	__wt_block_extlist_free(session, &si->discard);
-
 	__wt_block_extlist_free(session, &si->snapshot_avail);
-
-	block->live_load = 0;
-
-	return (ret);
 }
 
 /*
@@ -267,8 +273,15 @@ __snapshot_process(
 	 * but there's no explicit "free the snapshot information" call into the
 	 * block manager; if there was an error in an upper level resulting in
 	 * the snapshot never being "resolved", the list might not be empty.
+	 *
+	 * XXX
+	 * This isn't sufficient, actually: we're going to leak all the blocks
+	 * that were written as part of the last snapshot because it was never
+	 * resolved.
 	 */
 	__wt_block_extlist_free(session, &si->snapshot_avail);
+	WT_RET(__wt_block_extlist_init(
+	    session, &si->snapshot_avail, "live", "snapshot_avail"));
 
 	/*
 	 * To delete a snapshot, we'll need snapshot information for it, and we
@@ -309,7 +322,7 @@ __snapshot_process(
 		WT_ERR(__wt_calloc(
 		    session, 1, sizeof(WT_BLOCK_SNAPSHOT), &snap->bpriv));
 		si = snap->bpriv;
-		WT_ERR(__wt_block_snap_init(session, block, si, 0));
+		WT_ERR(__wt_block_snap_init(session, block, si, snap->name, 0));
 		WT_ERR(__wt_block_buffer_to_snapshot(
 		    session, block, snap->raw.data, si));
 		WT_ERR(__wt_block_extlist_read(session, block, &si->alloc));
@@ -467,11 +480,14 @@ live_update:
 		}
 
 	/*
-	 * Discard the live system's alloc and discard extent lists, leave the
+	 * Reset the live system's alloc and discard extent lists, leave the
 	 * avail list alone.
 	 */
 	__wt_block_extlist_free(session, &si->alloc);
+	WT_ERR(__wt_block_extlist_init(session, &si->alloc, "live", "alloc"));
 	__wt_block_extlist_free(session, &si->discard);
+	WT_ERR(
+	    __wt_block_extlist_init(session, &si->discard, "live", "discard"));
 
 #ifdef HAVE_DIAGNOSTIC
 	/*
@@ -638,7 +654,7 @@ __snapshot_string(WT_SESSION_IMPL *session,
 
 	/* Initialize the snapshot, crack the cookie. */
 	si = &_si;
-	WT_RET(__wt_block_snap_init(session, block, si, 0));
+	WT_RET(__wt_block_snap_init(session, block, si, "string", 0));
 	WT_RET(__wt_block_buffer_to_snapshot(session, block, addr, si));
 
 	WT_RET(__wt_buf_fmt(session, buf,
diff --git a/src/block/block_vrfy.c b/src/block/block_vrfy.c
index 7ce7787c08c..711e982b66d 100644
--- a/src/block/block_vrfy.c
+++ b/src/block/block_vrfy.c
@@ -32,10 +32,6 @@ __wt_block_verify_start(
 {
 	off_t file_size;
 
-	memset(&block->verify_alloc, 0, sizeof(block->verify_alloc));
-	block->verify_alloc.name = "verify_alloc";
-	block->verify_alloc.offset = WT_BLOCK_INVALID_OFFSET;
-
 	/*
 	 * We're done if the file has no data pages (this happens if we verify
 	 * a file immediately after creation).
@@ -81,6 +77,13 @@ __wt_block_verify_start(
 	WT_RET(__bit_alloc(session, block->frags, &block->fragfile));
 
 	/*
+	 * We maintain an allocation list that is rolled forward through the
+	 * set of snapshots.
+	 */
+	WT_RET(__wt_block_extlist_init(
+	    session, &block->verify_alloc, "verify", "alloc"));
+
+	/*
 	 * The only snapshot avail list we care about is the last one written;
 	 * get it now and initialize the list of file fragments.
 	 */
@@ -160,20 +163,20 @@ __verify_start_avail(
 	--snap;
 
 	si = &_si;
-	WT_RET(__wt_block_snap_init(session, block, si, 0));
-	WT_RET(__wt_block_buffer_to_snapshot(
-	    session, block, snap->raw.data, si));
-	el = &si->avail;
-	if (el->offset == WT_BLOCK_INVALID_OFFSET)
-		return (0);
+	WT_RET(__wt_block_snap_init(session, block, si, snap->name, 0));
+	WT_ERR(
+	    __wt_block_buffer_to_snapshot(session, block, snap->raw.data, si));
 
-	WT_RET(__wt_block_extlist_read(session, block, el));
-	WT_EXT_FOREACH(ext, el->off)
-		if ((ret = __verify_filefrag_add(
-		    session, block, ext->off, ext->size, 1)) != 0)
-			break;
+	el = &si->avail;
+	if (el->offset != WT_BLOCK_INVALID_OFFSET) {
+		WT_ERR(__wt_block_extlist_read(session, block, el));
+		WT_EXT_FOREACH(ext, el->off)
+			if ((ret = __verify_filefrag_add(
+			    session, block, ext->off, ext->size, 1)) != 0)
+				break;
+	}
 
-	__wt_block_extlist_free(session, el);
+err:	__wt_block_snap_destroy(session, si);
 	return (ret);
 }
 
diff --git a/src/block/block_write.c b/src/block/block_write.c
index ec2cd85a9dd..504a1ab18d9 100644
--- a/src/block/block_write.c
+++ b/src/block/block_write.c
@@ -254,7 +254,8 @@ not_compressed:	/*
 	WT_CSTAT_INCR(session, block_write);
 
 	WT_VERBOSE_ERR(session, write,
-	    "off %" PRIuMAX ", size %" PRIu32 ", cksum %" PRIu32,
+	    "%s (off %" PRIuMAX ", size %" PRIu32 ", cksum %" PRIu32 ")",
+	    __wt_page_type_string(dsk->type),
 	    (uintmax_t)offset, align_size, blk->cksum);
 
 	*offsetp = offset;
diff --git a/src/btree/bt_evict.c b/src/btree/bt_evict.c
index a478cf16edf..064106d29c9 100644
--- a/src/btree/bt_evict.c
+++ b/src/btree/bt_evict.c
@@ -724,8 +724,12 @@ __evict_walk(WT_SESSION_IMPL *session)
 	 * We hold a spinlock for the entire walk -- it's slow, but (1) how
 	 * often do new files get added or removed to/from the system, and (2)
 	 * it's all in-memory stuff, so it's not that slow.
+	 *
+	 * If the connection spinlock is not available, don't block: another
+	 * thread may be holding it and waiting on eviction (e.g., checkpoint).
 	 */
-	__wt_spin_lock(session, &conn->spinlock);
+	if (__wt_spin_trylock(session, &conn->spinlock) != 0)
+		return (0);
 
 	/*
 	 * Resize the array in which we're tracking pages, as necessary, then
@@ -734,8 +738,8 @@ __evict_walk(WT_SESSION_IMPL *session)
 	 */
 	elem = WT_EVICT_WALK_BASE + (conn->btqcnt * WT_EVICT_WALK_PER_TABLE);
 	if (elem > cache->evict_entries) {
-		/* Save the offset of the eviction point. */
 		__wt_spin_lock(session, &cache->evict_lock);
+		/* Save the offset of the eviction point. */
 		i = (u_int)(cache->evict_current - cache->evict);
 		WT_ERR(__wt_realloc(session, &cache->evict_allocated,
 		    elem * sizeof(WT_EVICT_ENTRY), &cache->evict));
diff --git a/src/btree/rec_write.c b/src/btree/rec_write.c
index 22539e1ff73..633bd7e04db 100644
--- a/src/btree/rec_write.c
+++ b/src/btree/rec_write.c
@@ -968,7 +968,6 @@ __rec_split_write(
 	uint8_t addr[WT_BTREE_MAX_ADDR_COOKIE];
 
 	dsk = buf->mem;
-	WT_VERBOSE_RET(session, write, "%s", __wt_page_type_string(dsk->type));
 
 	/*
 	 * We always write an additional byte on row-store leaf pages after the
diff --git a/src/docs/admin.dox b/src/docs/admin.dox
index 3fe634c6749..63761584a66 100644
--- a/src/docs/admin.dox
+++ b/src/docs/admin.dox
@@ -1,4 +1,4 @@
-/*! @page admin Managing a WiredTiger Database
+/*! @page admin Managing WiredTiger databases
 
 - @subpage home
 - @subpage security
diff --git a/src/docs/introduction.dox b/src/docs/introduction.dox
index 84ddd0865c2..978e599ce01 100644
--- a/src/docs/introduction.dox
+++ b/src/docs/introduction.dox
@@ -29,6 +29,8 @@ For more information about using WiredTiger, see:
 
 - @subpage install\n
 
+- @subpage upgrading\n
+
 - @subpage programming\n
 
 - @ref wt "WiredTiger API reference manual"
diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox
new file mode 100644
index 00000000000..f71bef39454
--- /dev/null
+++ b/src/docs/upgrading.dox
@@ -0,0 +1,8 @@
+/*! @page upgrading Upgrading WiredTiger applications
+
+@section version13 Version 1.3
+
+ - There were no API changes in release 1.3.
+ - There were no file format changes in release 1.3.
+
+*/
diff --git a/src/include/extern.h b/src/include/extern.h
index cd972b3edb0..d756203f2ea 100644
--- a/src/include/extern.h
+++ b/src/include/extern.h
@@ -71,6 +71,10 @@ extern int __wt_block_extlist_write(WT_SESSION_IMPL *session,
 extern int __wt_block_extlist_truncate( WT_SESSION_IMPL *session,
     WT_BLOCK *block,
     WT_EXTLIST *el);
+extern int __wt_block_extlist_init(WT_SESSION_IMPL *session,
+    WT_EXTLIST *el,
+    const char *name,
+    const char *extname);
 extern void __wt_block_extlist_free(WT_SESSION_IMPL *session, WT_EXTLIST *el);
 extern int __wt_block_extlist_dump( WT_SESSION_IMPL *session,
     const char *tag,
@@ -166,6 +170,7 @@ extern int __wt_block_salvage_next( WT_SESSION_IMPL *session,
 extern int __wt_block_snap_init(WT_SESSION_IMPL *session,
     WT_BLOCK *block,
     WT_BLOCK_SNAPSHOT *si,
+    const char *name,
     int is_live);
 extern int __wt_block_snapshot_load(WT_SESSION_IMPL *session,
     WT_BLOCK *block,
@@ -175,6 +180,8 @@ extern int __wt_block_snapshot_load(WT_SESSION_IMPL *session,
     int readonly);
 extern int __wt_block_snapshot_unload(WT_SESSION_IMPL *session,
     WT_BLOCK *block);
+extern void __wt_block_snap_destroy(WT_SESSION_IMPL *session,
+    WT_BLOCK_SNAPSHOT *si);
 extern int __wt_block_snapshot(WT_SESSION_IMPL *session,
     WT_BLOCK *block,
     WT_ITEM *buf,
diff --git a/src/support/pow.c b/src/support/pow.c
index 25bd587e26d..647c6ca89bd 100644
--- a/src/support/pow.c
+++ b/src/support/pow.c
@@ -1,8 +1,28 @@
 /*-
  * Copyright (c) 2008-2012 WiredTiger, Inc.
- *	All rights reserved.
  *
- * See the file LICENSE for redistribution information.
+ * This is free and unencumbered software released into the public domain.
+ *
+ * Anyone is free to copy, modify, publish, use, compile, sell, or
+ * distribute this software, either in source code form or as a compiled
+ * binary, for any purpose, commercial or non-commercial, and by any
+ * means.
+ *
+ * In jurisdictions that recognize copyright laws, the author or authors
+ * of this software dedicate any and all copyright interest in the
+ * software to the public domain. We make this dedication for the benefit
+ * of the public at large and to the detriment of our heirs and
+ * successors. We intend this dedication to be an overt act of
+ * relinquishment in perpetuity of all present and future rights to this
+ * software under copyright law.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "wt_internal.h"