diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2014-09-04 07:17:58 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2014-09-04 07:17:58 -0400 |
| commit | d3eecc260fb9bf7ea35b28c997100c8265c3a650 (patch) | |
| tree | 85126a3000746f179712e7a9f3c65967671a2cb9 | |
| parent | f09907df8b8f26cd0e4adaa4c0e730a550a6b020 (diff) | |
| download | mongo-d3eecc260fb9bf7ea35b28c997100c8265c3a650.tar.gz | |
long lines, whitespace
| -rw-r--r-- | src/conn/conn_handle.c | 8 | ||||
| -rw-r--r-- | src/lsm/lsm_manager.c | 3 | ||||
| -rw-r--r-- | src/lsm/lsm_worker.c | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/conn/conn_handle.c b/src/conn/conn_handle.c index af1513b3014..66517f9c2de 100644 --- a/src/conn/conn_handle.c +++ b/src/conn/conn_handle.c @@ -52,10 +52,10 @@ __wt_connection_init(WT_CONNECTION_IMPL *conn) __wt_spin_init(session, &conn->page_lock[i], "btree page")); /* Setup the spin locks for the LSM manager queues. */ - WT_RET(__wt_spin_init( - session, &conn->lsm_manager.app_lock, "LSM application queue lock")); - WT_RET(__wt_spin_init( - session, &conn->lsm_manager.manager_lock, "LSM manager queue lock")); + WT_RET(__wt_spin_init(session, + &conn->lsm_manager.app_lock, "LSM application queue lock")); + WT_RET(__wt_spin_init(session, + &conn->lsm_manager.manager_lock, "LSM manager queue lock")); WT_RET(__wt_spin_init( session, &conn->lsm_manager.switch_lock, "LSM switch queue lock")); WT_RET(__wt_cond_alloc( diff --git a/src/lsm/lsm_manager.c b/src/lsm/lsm_manager.c index 1c9240d6af6..34cd13554d1 100644 --- a/src/lsm/lsm_manager.c +++ b/src/lsm/lsm_manager.c @@ -16,7 +16,7 @@ static void * __lsm_worker_manager(void *); /* * __wt_lsm_manager_start -- * Start the LSM management infrastructure. Our queues and locks were - * initialized when the connection was intialized. + * initialized when the connection was initialized. */ int __wt_lsm_manager_start(WT_SESSION_IMPL *session) @@ -156,7 +156,6 @@ __wt_lsm_manager_destroy(WT_CONNECTION_IMPL *conn) __wt_spin_destroy(session, &manager->manager_lock); WT_TRET(__wt_cond_destroy(session, &manager->work_cond)); - return (ret); } diff --git a/src/lsm/lsm_worker.c b/src/lsm/lsm_worker.c index 0bb6cfb9c08..257fda03f3b 100644 --- a/src/lsm/lsm_worker.c +++ b/src/lsm/lsm_worker.c @@ -93,7 +93,8 @@ __lsm_worker(void *arg) (ret = __wt_lsm_manager_pop_entry( session, WT_LSM_WORK_SWITCH, &entry)) == 0 && entry != NULL) - WT_ERR(__wt_lsm_work_switch(session, &entry, &progress)); + WT_ERR( + __wt_lsm_work_switch(session, &entry, &progress)); /* Flag an error if the pop failed. */ WT_ERR(ret); |