From 343670b52db4b13f67200e75a9a27f857bd0ceda Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Sat, 7 Mar 2020 06:31:35 +0100 Subject: [PATCH] infra: remove superfluous parameter --- kernel/mars_server.c | 4 ++-- kernel/sy_old/mars_main.c | 12 ++++++------ kernel/sy_old/strategy.h | 1 - kernel/sy_old/sy_generic.c | 8 ++------ 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/kernel/mars_server.c b/kernel/mars_server.c index e7627fd8..cc5d1244 100644 --- a/kernel/mars_server.c +++ b/kernel/mars_server.c @@ -407,7 +407,7 @@ int handler_thread(void *data) } status = mars_kill_brick_when_possible(handler_global, - false, NULL, true); + NULL, true); MARS_DBG("kill handler bricks (when possible) = %d\n", status); } @@ -853,7 +853,7 @@ static int _server_thread(void *data) show_statistics(server_global, "server"); status = mars_kill_brick_when_possible(server_global, - false, NULL, true); + NULL, true); MARS_DBG("kill server bricks (when possible) = %d\n", status); if (!mars_global || !mars_global->global_power.button) { diff --git a/kernel/sy_old/mars_main.c b/kernel/sy_old/mars_main.c index b89dffb7..adee719e 100644 --- a/kernel/sy_old/mars_main.c +++ b/kernel/sy_old/mars_main.c @@ -6336,25 +6336,25 @@ static int _main_thread(void *data) if (!mars_global->global_power.button) { status = mars_kill_brick_when_possible(mars_global, - false, (void*)©_brick_type, true); + (void*)©_brick_type, true); MARS_DBG("kill copy bricks (when possible) = %d\n", status); } status = mars_kill_brick_when_possible(mars_global, - false, NULL, false); + NULL, false); MARS_DBG("kill main bricks (when possible) = %d\n", status); status = mars_kill_brick_when_possible(mars_global, - false, (void*)&client_brick_type, true); + (void*)&client_brick_type, true); MARS_DBG("kill client bricks (when possible) = %d\n", status); status = mars_kill_brick_when_possible(mars_global, - false, (void*)&aio_brick_type, true); + (void*)&aio_brick_type, true); MARS_DBG("kill aio bricks (when possible) = %d\n", status); status = mars_kill_brick_when_possible(mars_global, - false, (void*)&sio_brick_type, true); + (void*)&sio_brick_type, true); MARS_DBG("kill sio bricks (when possible) = %d\n", status); status = mars_kill_brick_when_possible(mars_global, - false, (void*)&bio_brick_type, true); + (void*)&bio_brick_type, true); MARS_DBG("kill bio bricks (when possible) = %d\n", status); if ((long long)jiffies + mars_rollover_interval * HZ >= last_rollover) { diff --git a/kernel/sy_old/strategy.h b/kernel/sy_old/strategy.h index e1f41b83..11b3a9c5 100644 --- a/kernel/sy_old/strategy.h +++ b/kernel/sy_old/strategy.h @@ -170,7 +170,6 @@ extern int mars_free_brick(struct mars_brick *brick); extern int mars_kill_brick(struct mars_brick *brick); extern int mars_kill_brick_all(struct mars_global *global, struct list_head *anchor, bool use_dent_link); extern int mars_kill_brick_when_possible(struct mars_global *global, - bool use_dent_link, const struct mars_brick_type *type, bool even_on); diff --git a/kernel/sy_old/sy_generic.c b/kernel/sy_old/sy_generic.c index ae069ff1..b38a21e8 100644 --- a/kernel/sy_old/sy_generic.c +++ b/kernel/sy_old/sy_generic.c @@ -2628,7 +2628,6 @@ done: EXPORT_SYMBOL_GPL(mars_kill_brick_all); int mars_kill_brick_when_possible(struct mars_global *global, - bool use_dent_link, const struct mars_brick_type *type, bool even_on) { @@ -2646,11 +2645,8 @@ restart: int count; int status; - if (use_dent_link) { - brick = container_of(tmp, struct mars_brick, dent_brick_link); - } else { - brick = container_of(tmp, struct mars_brick, global_brick_link); - } + brick = container_of(tmp, struct mars_brick, global_brick_link); + // only kill the right brick types if (type && brick->type != type) { continue;