RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-05-08 19:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: remove superfluous parameter

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-03-07 06:31:35 +01:00
parent 333760bc1a
commit 343670b52d
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/mars_server.c
View File

@ -407,7 +407,7 @@ int handler_thread(void *data)
} }
status = mars_kill_brick_when_possible(handler_global, status = mars_kill_brick_when_possible(handler_global,
false, NULL, true); NULL, true);
MARS_DBG("kill handler bricks (when possible) = %d\n", status); 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"); show_statistics(server_global, "server");
status = mars_kill_brick_when_possible(server_global, status = mars_kill_brick_when_possible(server_global,
false, NULL, true); NULL, true);
MARS_DBG("kill server bricks (when possible) = %d\n", status); MARS_DBG("kill server bricks (when possible) = %d\n", status);
if (!mars_global || !mars_global->global_power.button) { if (!mars_global || !mars_global->global_power.button) {

12
kernel/sy_old/mars_main.c
View File

@ -6336,25 +6336,25 @@ static int _main_thread(void *data)
if (!mars_global->global_power.button) { if (!mars_global->global_power.button) {
status = mars_kill_brick_when_possible(mars_global, status = mars_kill_brick_when_possible(mars_global,
false, (void*)&copy_brick_type, true); (void*)&copy_brick_type, true);
MARS_DBG("kill copy bricks (when possible) = %d\n", status); MARS_DBG("kill copy bricks (when possible) = %d\n", status);
} }
status = mars_kill_brick_when_possible(mars_global, status = mars_kill_brick_when_possible(mars_global,
false, NULL, false); NULL, false);
MARS_DBG("kill main bricks (when possible) = %d\n", status); MARS_DBG("kill main bricks (when possible) = %d\n", status);
status = mars_kill_brick_when_possible(mars_global, 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); MARS_DBG("kill client bricks (when possible) = %d\n", status);
status = mars_kill_brick_when_possible(mars_global, 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); MARS_DBG("kill aio bricks (when possible) = %d\n", status);
status = mars_kill_brick_when_possible(mars_global, 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); MARS_DBG("kill sio bricks (when possible) = %d\n", status);
status = mars_kill_brick_when_possible(mars_global, 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); MARS_DBG("kill bio bricks (when possible) = %d\n", status);
if ((long long)jiffies + mars_rollover_interval * HZ >= last_rollover) { if ((long long)jiffies + mars_rollover_interval * HZ >= last_rollover) {

1
kernel/sy_old/strategy.h
View File

@ -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(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_all(struct mars_global *global, struct list_head *anchor, bool use_dent_link);
extern int mars_kill_brick_when_possible(struct mars_global *global, extern int mars_kill_brick_when_possible(struct mars_global *global,
bool use_dent_link,
const struct mars_brick_type *type, const struct mars_brick_type *type,
bool even_on); bool even_on);

8
kernel/sy_old/sy_generic.c
View File

@ -2628,7 +2628,6 @@ done:
EXPORT_SYMBOL_GPL(mars_kill_brick_all); EXPORT_SYMBOL_GPL(mars_kill_brick_all);
int mars_kill_brick_when_possible(struct mars_global *global, int mars_kill_brick_when_possible(struct mars_global *global,
bool use_dent_link,
const struct mars_brick_type *type, const struct mars_brick_type *type,
bool even_on) bool even_on)
{ {
@ -2646,11 +2645,8 @@ restart:
int count; int count;
int status; int status;
if (use_dent_link) { brick = container_of(tmp, struct mars_brick, global_brick_link);
brick = container_of(tmp, struct mars_brick, dent_brick_link);
} else {
brick = container_of(tmp, struct mars_brick, global_brick_link);
}
// only kill the right brick types // only kill the right brick types
if (type && brick->type != type) { if (type && brick->type != type) {
continue; continue;