From 6de8dc963960d6e6a8ecacbbb2164ae677d6baf9 Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Tue, 2 Apr 2013 15:35:13 +0200 Subject: [PATCH] trans_logger: remove broken queue depth limit It wqas broken by concept: large requests from userspace max be split into many mrefs. Thus a limit on units of #mrefs is not comparable to userspace limits. Instead, the ordinary nr_requests limits on kernel device queues should suffice to get to the intended effect. --- mars_trans_logger.c | 6 +----- mars_trans_logger.h | 1 - sy_old/mars_proc.c | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/mars_trans_logger.c b/mars_trans_logger.c index 259289f1..76727dd0 100644 --- a/mars_trans_logger.c +++ b/mars_trans_logger.c @@ -66,9 +66,6 @@ EXPORT_SYMBOL_GPL(trans_logger_do_crc); int trans_logger_mem_usage; // in KB EXPORT_SYMBOL_GPL(trans_logger_mem_usage); -int trans_logger_max_depth = 128; -EXPORT_SYMBOL_GPL(trans_logger_max_depth); - struct writeback_group global_writeback = { .lock = __RW_LOCK_UNLOCKED(global_writeback.lock), .group_anchor = LIST_HEAD_INIT(global_writeback.group_anchor), @@ -684,8 +681,7 @@ 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) && - (trans_logger_max_depth <= 0 || atomic_read(&brick->q_phase[0].q_queued) < trans_logger_max_depth), + (brick_global_memlimit < 1024 || atomic64_read(&global_mshadow_used) / 1024 < brick_global_memlimit), HZ / 2); #endif diff --git a/mars_trans_logger.h b/mars_trans_logger.h index e1343dc0..cc7ee371 100644 --- a/mars_trans_logger.h +++ b/mars_trans_logger.h @@ -25,7 +25,6 @@ extern int trans_logger_completion_semantics; extern int trans_logger_do_crc; extern int trans_logger_mem_usage; // in KB -extern int trans_logger_max_depth; extern atomic_t global_mshadow_count; extern atomic64_t global_mshadow_used; diff --git a/sy_old/mars_proc.c b/sy_old/mars_proc.c index d21f9760..750bbc69 100644 --- a/sy_old/mars_proc.c +++ b/sy_old/mars_proc.c @@ -210,7 +210,6 @@ ctl_table mars_table[] = { INT_ENTRY("syslog_max_class", brick_say_syslog_max, 0600), INT_ENTRY("delay_say_on_overflow",delay_say_on_overflow, 0600), INT_ENTRY("mapfree_period_sec", mapfree_period_sec, 0600), - INT_ENTRY("logger_max_depth", trans_logger_max_depth, 0600), INT_ENTRY("mem_limit_percent", mars_mem_percent, 0600), INT_ENTRY("logger_mem_used_kb", trans_logger_mem_usage, 0400), INT_ENTRY("mem_used_raw_kb", brick_global_block_used,0400),