diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2015-04-16 12:22:31 -0400 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-04-25 12:50:52 +1000 |
| commit | 25e3e44bd03cfbe4dcd750e4f5cbdd48eefd119c (patch) | |
| tree | 6dc6f5162f05223cb118782144b122f777746764 | |
| parent | 04cb0cf13dc5a7d8b0e617a9ba71181cbcdd457a (diff) | |
| download | mongo-25e3e44bd03cfbe4dcd750e4f5cbdd48eefd119c.tar.gz | |
Remove use of unneeded tmp_fh. WT-1872
| -rw-r--r-- | src/log/log.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/log/log.c b/src/log/log.c index 4196683d4e4..876da244794 100644 --- a/src/log/log.c +++ b/src/log/log.c @@ -584,7 +584,7 @@ __log_truncate(WT_SESSION_IMPL *session, { WT_CONNECTION_IMPL *conn; WT_DECL_RET; - WT_FH *log_fh, *tmp_fh; + WT_FH *log_fh; WT_LOG *log; uint32_t lognum; u_int i, logcount; @@ -601,10 +601,8 @@ __log_truncate(WT_SESSION_IMPL *session, */ WT_ERR(__log_openfile(session, 0, &log_fh, file_prefix, lsn->file)); WT_ERR(__wt_ftruncate(session, log_fh, lsn->offset)); - tmp_fh = log_fh; - log_fh = NULL; - WT_ERR(__wt_fsync(session, tmp_fh)); - WT_ERR(__wt_close(session, &tmp_fh)); + WT_ERR(__wt_fsync(session, log_fh)); + WT_ERR(__wt_close(session, &log_fh)); /* * If we just want to truncate the current log, return and skip @@ -625,10 +623,8 @@ __log_truncate(WT_SESSION_IMPL *session, */ WT_ERR(__wt_ftruncate(session, log_fh, LOG_FIRST_RECORD)); - tmp_fh = log_fh; - log_fh = NULL; - WT_ERR(__wt_fsync(session, tmp_fh)); - WT_ERR(__wt_close(session, &tmp_fh)); + WT_ERR(__wt_fsync(session, log_fh)); + WT_ERR(__wt_close(session, &log_fh)); } } err: WT_TRET(__wt_close(session, &log_fh)); @@ -650,7 +646,7 @@ __wt_log_allocfile( WT_DECL_ITEM(from_path); WT_DECL_ITEM(to_path); WT_DECL_RET; - WT_FH *log_fh, *tmp_fh; + WT_FH *log_fh; WT_LOG *log; conn = S2C(session); @@ -675,10 +671,8 @@ __wt_log_allocfile( WT_ERR(__wt_ftruncate(session, log_fh, LOG_FIRST_RECORD)); if (prealloc) WT_ERR(__log_prealloc(session, log_fh)); - tmp_fh = log_fh; - log_fh = NULL; - WT_ERR(__wt_fsync(session, tmp_fh)); - WT_ERR(__wt_close(session, &tmp_fh)); + WT_ERR(__wt_fsync(session, log_fh)); + WT_ERR(__wt_close(session, &log_fh)); WT_ERR(__wt_verbose(session, WT_VERB_LOG, "log_prealloc: rename %s to %s", (char *)from_path->data, (char *)to_path->data)); |