summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@mongodb.com>2016-03-22 13:48:14 +1100
committerMichael Cahill <michael.cahill@mongodb.com>2016-03-22 13:48:14 +1100
commit1f21bcdca279c22c688cdd810c9b9ad9f2f012b5 (patch)
tree7a6079378d3a43f292bfae05e14dfc0433b6dc56
parent2371e490429ba3780e75e2910a2e686ae77ad040 (diff)
downloadmongo-1f21bcdca279c22c688cdd810c9b9ad9f2f012b5.tar.gz
WT-2506 Reorder to fix uninitialized variable warning.
-rw-r--r--src/txn/txn_ckpt.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c
index a4a24b41a89..1eebc9e9d04 100644
--- a/src/txn/txn_ckpt.c
+++ b/src/txn/txn_ckpt.c
@@ -996,6 +996,15 @@ __checkpoint_tree(
was_modified = btree->modified;
/*
+ * Set the checkpoint LSN to the maximum LSN so that if logging is
+ * disabled, recovery will never roll old changes forward over the
+ * non-logged changes in this checkpoint. If logging is enabled, a
+ * real checkpoint LSN will be assigned for this checkpoint and
+ * overwrite this.
+ */
+ WT_MAX_LSN(&ckptlsn);
+
+ /*
* Check for clean objects not requiring a checkpoint.
*
* If we're closing a handle, and the object is clean, we can skip the
@@ -1105,15 +1114,6 @@ nockpt: F_SET(btree, WT_BTREE_SKIP_CKPT);
btree->modified = 0;
WT_FULL_BARRIER();
- /*
- * Set the checkpoint LSN to the maximum LSN so that if logging is
- * disabled, recovery will never roll old changes forward over the
- * non-logged changes in this checkpoint. If logging is enabled, a
- * real checkpoint LSN will be assigned for this checkpoint and
- * overwrite this.
- */
- WT_MAX_LSN(&ckptlsn);
-
/* Tell logging that a file checkpoint is starting. */
if (FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED))
WT_ERR(__wt_txn_checkpoint_log(