summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2015-03-09 05:53:38 +0000
committerAlex Gorrod <alexg@wiredtiger.com>2015-03-09 05:53:38 +0000
commit0afa07b0cd666adf7576901540a699b0bec396e3 (patch)
tree69dc720ab1e3eccd21d14745d4f93a21dc4e639b
parentd654795bb763b95d14604b9b65d09ae79b8ee5b6 (diff)
downloadmongo-0afa07b0cd666adf7576901540a699b0bec396e3.tar.gz
Revert part of #1683. Always set the slot error if we had a problem
closing the slot. COVERITY CID 1287326
-rw-r--r--src/log/log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/log/log.c b/src/log/log.c
index 2fe82e61ef0..f485f0a09e5 100644
--- a/src/log/log.c
+++ b/src/log/log.c
@@ -1040,12 +1040,12 @@ __log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot, int *freep)
F_CLR(slot, SLOT_SYNC | SLOT_SYNC_DIR);
locked = 0;
__wt_spin_unlock(session, &log->log_sync_lock);
- if (ret != 0 && slot->slot_error == 0)
- slot->slot_error = ret;
break;
}
err: if (locked)
__wt_spin_unlock(session, &log->log_sync_lock);
+ if (ret != 0 && slot->slot_error == 0)
+ slot->slot_error = ret;
done:
return (ret);
}