Rename the WT_FH.file_size field to be WT_FH.size.

10 files changed, 33 insertions, 32 deletions

diff --git a/src/block/block_addr.c b/src/block/block_addr.c
index 0af3f20d357..95e591efb2a 100644
--- a/src/block/block_addr.c
+++ b/src/block/block_addr.c
@@ -100,7 +100,7 @@ __wt_block_addr_valid(WT_SESSION_IMPL *session,
 	WT_RET(__wt_block_buffer_to_addr(block, addr, &offset, &size, &cksum));
 
 	/* All we care about is if it's past the end of the file. */
-	return (offset + size > block->fh->file_size ? 0 : 1);
+	return (offset + size > block->fh->size ? 0 : 1);
 }
 
 /*
diff --git a/src/block/block_compact.c b/src/block/block_compact.c
index b5d631ab4c2..9a4984ca64e 100644
--- a/src/block/block_compact.c
+++ b/src/block/block_compact.c
@@ -34,19 +34,19 @@ __wt_block_compact_skip(
 	 * compaction unless we have an expectation of moving N % of the file
 	 * from the last half of the file to the first half of the file.)
 	 */
-	if (fh->file_size <= 10 * 1024)
+	if (fh->size <= 10 * 1024)
 		return (0);
 
 	__wt_spin_lock(session, &block->live_lock);
 
 	avail = 0;
-	half = fh->file_size / 2;
+	half = fh->size / 2;
 
 	el = &block->live.avail;
 	WT_EXT_FOREACH(ext, el->off)
 		if (ext->off < half)
 			avail += ext->size;
-	pct = (int)((avail * 100) / fh->file_size);
+	pct = (int)((avail * 100) / fh->size);
 
 	__wt_spin_unlock(session, &block->live_lock);
 
@@ -91,7 +91,7 @@ __wt_block_compact_page_skip(WT_SESSION_IMPL *session,
 	 * here a lot.
 	 */
 	__wt_spin_lock(session, &block->live_lock);
-	*skipp = offset > fh->file_size / 2 ? 0 : 1;
+	*skipp = offset > fh->size / 2 ? 0 : 1;
 	__wt_spin_unlock(session, &block->live_lock);
 
 	return (0);
diff --git a/src/block/block_ext.c b/src/block/block_ext.c
index c89dd3a85ef..3bf16e71465 100644
--- a/src/block/block_ext.c
+++ b/src/block/block_ext.c
@@ -459,7 +459,7 @@ __block_extend(
 	 *
 	 * We should never be allocating from an empty file.
 	 */
-	if (fh->file_size < block->allocsize)
+	if (fh->size < block->allocsize)
 		WT_RET_MSG(session, EINVAL,
 		    "cannot allocate from a file with no description "
 		    "information");
@@ -470,12 +470,12 @@ __block_extend(
 	 * bits (we currently check an off_t is 8B in verify_build.h).  I don't
 	 * think we're likely to see anything bigger for awhile.
 	 */
-	if (fh->file_size > (off_t)INT64_MAX - size)
+	if (fh->size > (off_t)INT64_MAX - size)
 		WT_RET_MSG(session, WT_ERROR,
 		    "block allocation failed, file cannot grow further");
 
-	*offp = fh->file_size;
-	fh->file_size += size;
+	*offp = fh->size;
+	fh->size += size;
 
 	WT_DSTAT_INCR(session, block_extension);
 	WT_VERBOSE_RET(session, block,
@@ -1203,7 +1203,7 @@ __wt_block_extlist_truncate(
 {
 	WT_EXT *ext;
 	WT_FH *fh;
-	off_t file_size;
+	off_t size;
 
 	fh = block->fh;
 
@@ -1213,22 +1213,22 @@ __wt_block_extlist_truncate(
 	 */
 	if ((ext = __block_extlist_last(el->off)) == NULL)
 		return (0);
-	if (ext->off + ext->size != fh->file_size)
+	if (ext->off + ext->size != fh->size)
 		return (0);
 
 	WT_VERBOSE_RET(session, block,
 	    "truncate file from %" PRIdMAX " to %" PRIdMAX,
-	    (intmax_t)fh->file_size, (intmax_t)ext->off);
+	    (intmax_t)fh->size, (intmax_t)ext->off);
 
 	/*
 	 * We're about to remove the extent list entry, save the value, we need
 	 * it to reset the cached file size, and that can't happen until after
 	 * truncate and extent list removal succeed.
 	 */
-	file_size = ext->off;
-	WT_RET(__wt_ftruncate(session, fh, file_size));
-	WT_RET(__block_off_remove(session, block, el, file_size, NULL));
-	fh->file_size = file_size;
+	size = ext->off;
+	WT_RET(__wt_ftruncate(session, fh, size));
+	WT_RET(__block_off_remove(session, block, el, size, NULL));
+	fh->size = size;
 
 	return (0);
 }
diff --git a/src/block/block_open.c b/src/block/block_open.c
index eced9b3be30..355c1a0943e 100644
--- a/src/block/block_open.c
+++ b/src/block/block_open.c
@@ -319,6 +319,6 @@ __wt_block_stat(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_DSRC_STATS *stats)
 	WT_STAT_SET(session, stats, block_magic, WT_BLOCK_MAGIC);
 	WT_STAT_SET(session, stats, block_major, WT_BLOCK_MAJOR_VERSION);
 	WT_STAT_SET(session, stats, block_minor, WT_BLOCK_MINOR_VERSION);
-	WT_STAT_SET(session, stats, block_size, block->fh->file_size);
+	WT_STAT_SET(session, stats, block_size, block->fh->size);
 	__wt_spin_unlock(session, &block->live_lock);
 }
diff --git a/src/block/block_slvg.c b/src/block/block_slvg.c
index cf7ab2b28ac..793fce4cc51 100644
--- a/src/block/block_slvg.c
+++ b/src/block/block_slvg.c
@@ -32,9 +32,9 @@ __wt_block_salvage_start(WT_SESSION_IMPL *session, WT_BLOCK *block)
 	 * Truncate the file to an allocation-size multiple of blocks (bytes
 	 * trailing the last block must be garbage, by definition).
 	 */
-	if (block->fh->file_size > allocsize) {
-		len = (block->fh->file_size / allocsize) * allocsize;
-		if (len != block->fh->file_size)
+	if (block->fh->size > allocsize) {
+		len = (block->fh->size / allocsize) * allocsize;
+		if (len != block->fh->size)
 			WT_RET(__wt_ftruncate(session, block->fh, len));
 	} else
 		len = allocsize;
@@ -91,7 +91,7 @@ __wt_block_salvage_next(WT_SESSION_IMPL *session,
 	WT_ERR(__wt_scr_alloc(session, allocsize, &tmp));
 
 	/* Read through the file, looking for pages. */
-	for (max = fh->file_size;;) {
+	for (max = fh->size;;) {
 		offset = block->slvg_off;
 		if (offset >= max) {			/* Check eof. */
 			*eofp = 1;
diff --git a/src/block/block_vrfy.c b/src/block/block_vrfy.c
index fa328975259..3d73801b449 100644
--- a/src/block/block_vrfy.c
+++ b/src/block/block_vrfy.c
@@ -38,7 +38,7 @@ __wt_block_verify_start(
 	 * sense if we don't have a checkpoint.
 	 */
 	fh = block->fh;
-	if (fh->file_size == block->allocsize)
+	if (fh->size == block->allocsize)
 		return (0);
 
 	/*
@@ -59,7 +59,7 @@ __wt_block_verify_start(
 	WT_RET(__verify_last_truncate(session, block, ckpt));
 
 	/* The file size should be a multiple of the allocation size. */
-	if (fh->file_size % block->allocsize != 0)
+	if (fh->size % block->allocsize != 0)
 		WT_RET_MSG(session, WT_ERROR,
 		    "the file size is not a multiple of the allocation size");
 
@@ -80,7 +80,7 @@ __wt_block_verify_start(
 	 * verify many non-contiguous blocks creating too many entries on the
 	 * list to fit into memory.
 	 */
-	block->frags = (uint64_t)WT_OFF_TO_FRAG(block, fh->file_size);
+	block->frags = (uint64_t)WT_OFF_TO_FRAG(block, fh->size);
 	WT_RET(__bit_alloc(session, block->frags, &block->fragfile));
 
 	/*
@@ -332,7 +332,7 @@ __verify_filefrag_add(WT_SESSION_IMPL *session,
 	    (uintmax_t)offset, (uintmax_t)(offset + size), (uintmax_t)size);
 
 	/* Check each chunk against the total file size. */
-	if (offset + size > block->fh->file_size)
+	if (offset + size > block->fh->size)
 		WT_RET_MSG(session, WT_ERROR,
 		    "fragment %" PRIuMAX "-%" PRIuMAX " references "
 		    "non-existent file blocks",
diff --git a/src/include/os.h b/src/include/os.h
index 4d752c2b538..46f20e0b1e2 100644
--- a/src/include/os.h
+++ b/src/include/os.h
@@ -38,8 +38,9 @@ struct __wt_fh {
 	TAILQ_ENTRY(__wt_fh) q;			/* List of open handles */
 
 	char	*name;				/* File name */
-	off_t	file_size;			/* File size */
+
 	int	fd;				/* POSIX file handle */
+	off_t	size;				/* File size */
 
 	int	direct_io;			/* O_DIRECT configured */
 };
diff --git a/src/os_posix/os_ftruncate.c b/src/os_posix/os_ftruncate.c
index 832c4d0207f..376dd388fe4 100644
--- a/src/os_posix/os_ftruncate.c
+++ b/src/os_posix/os_ftruncate.c
@@ -18,7 +18,7 @@ __wt_ftruncate(WT_SESSION_IMPL *session, WT_FH *fh, off_t len)
 
 	WT_SYSCALL_RETRY(ftruncate(fh->fd, len), ret);
 	if (ret == 0) {
-		fh->file_size = len;
+		fh->size = len;
 		return (0);
 	}
 
diff --git a/src/os_posix/os_map.c b/src/os_posix/os_map.c
index e78f05ec518..eda86c131fb 100644
--- a/src/os_posix/os_map.c
+++ b/src/os_posix/os_map.c
@@ -17,9 +17,9 @@ __wt_mmap(WT_SESSION_IMPL *session, WT_FH *fh, void *mapp, size_t *lenp)
 	void *map;
 
 	WT_VERBOSE_RET(session, fileops,
-	    "%s: map %" PRIuMAX " bytes", fh->name, (uintmax_t)fh->file_size);
+	    "%s: map %" PRIuMAX " bytes", fh->name, (uintmax_t)fh->size);
 
-	if ((map = mmap(NULL, (size_t)fh->file_size,
+	if ((map = mmap(NULL, (size_t)fh->size,
 	    PROT_READ,
 #ifdef MAP_NOCORE
 	    MAP_NOCORE |
@@ -28,11 +28,11 @@ __wt_mmap(WT_SESSION_IMPL *session, WT_FH *fh, void *mapp, size_t *lenp)
 	    fh->fd, (off_t)0)) == MAP_FAILED) {
 		WT_RET_MSG(session, __wt_errno(),
 		    "%s map error: failed to map %" PRIuMAX " bytes",
-		    fh->name, (uintmax_t)fh->file_size);
+		    fh->name, (uintmax_t)fh->size);
 	}
 
 	*(void **)mapp = map;
-	*lenp = (size_t)fh->file_size;
+	*lenp = (size_t)fh->size;
 	return (0);
 }
 
diff --git a/src/os_posix/os_open.c b/src/os_posix/os_open.c
index f35d976aab5..e73c4cde600 100644
--- a/src/os_posix/os_open.c
+++ b/src/os_posix/os_open.c
@@ -159,7 +159,7 @@ __wt_open(WT_SESSION_IMPL *session,
 #endif
 
 	/* Set the file's size. */
-	WT_ERR(__wt_filesize(session, fh, &fh->file_size));
+	WT_ERR(__wt_filesize(session, fh, &fh->size));
 
 	/* Link onto the environment's list of files. */
 	__wt_spin_lock(session, &conn->fh_lock);