From 454420d8497c7c4fc37963f5cccf33fce615fc37 Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Wed, 30 Sep 2015 15:12:42 +0200 Subject: [PATCH] logger: fix LOGICAL_CONTINUATIONS --- kernel/mars_trans_logger.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/kernel/mars_trans_logger.c b/kernel/mars_trans_logger.c index b0a173d6..7b83a63f 100644 --- a/kernel/mars_trans_logger.c +++ b/kernel/mars_trans_logger.c @@ -564,14 +564,14 @@ void _inf_callback(struct trans_logger_input *input, bool force) static inline int _congested(struct trans_logger_brick *brick) { - return atomic_read(&brick->q_phase[0].q_queued) - || atomic_read(&brick->q_phase[0].q_flying) - || atomic_read(&brick->q_phase[1].q_queued) - || atomic_read(&brick->q_phase[1].q_flying) - || atomic_read(&brick->q_phase[2].q_queued) - || atomic_read(&brick->q_phase[2].q_flying) - || atomic_read(&brick->q_phase[3].q_queued) - || atomic_read(&brick->q_phase[3].q_flying); + return atomic_read(&brick->q_phase[0].q_queued) || + atomic_read(&brick->q_phase[0].q_flying) || + atomic_read(&brick->q_phase[1].q_queued) || + atomic_read(&brick->q_phase[1].q_flying) || + atomic_read(&brick->q_phase[2].q_queued) || + atomic_read(&brick->q_phase[2].q_flying) || + atomic_read(&brick->q_phase[3].q_queued) || + atomic_read(&brick->q_phase[3].q_flying); } ////////////////// own brick / input / output operations ////////////////// @@ -696,7 +696,8 @@ int _write_ref_get(struct trans_logger_output *output, struct trans_logger_mref_ // delay in case of too many master shadows / memory shortage wait_event_interruptible_timeout(brick->caller_event, !brick->delay_callers && - (brick_global_memlimit < 1024 || atomic64_read(&global_mshadow_used) / 1024 < brick_global_memlimit), + (brick_global_memlimit < 1024 || + atomic64_read(&global_mshadow_used) / 1024 < brick_global_memlimit), HZ / 2); #endif