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

client: adapt timeout at get_info

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2017-01-10 12:48:15 +01:00
parent 205f32efb0
commit b3b4fb2274
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/mars_client.c
View File

@ -164,17 +164,30 @@ really_done:
return status;
}
static
long _compute_timeout(struct client_brick *brick)
{
long io_timeout = brick->power.io_timeout;
if (io_timeout <= 0)
io_timeout = global_net_io_timeout;
return io_timeout;
}
////////////////// own brick / input / output operations //////////////////
static int client_get_info(struct client_output *output, struct mars_info *info)
{
struct client_brick *brick = output->brick;
long io_timeout = _compute_timeout(brick);
int status;
output->got_info = false;
output->get_info = true;
wake_up_interruptible(&output->event);
wait_event_interruptible_timeout(output->info_event, output->got_info, 60 * HZ);
wait_event_interruptible_timeout(output->info_event, output->got_info, io_timeout * HZ);
status = -ETIME;
if (output->got_info && info) {
memcpy(info, &output->info, sizeof(*info));
@ -435,10 +448,7 @@ void _do_timeout(struct client_output *output, struct list_head *anchor, bool fo
struct list_head *next;
LIST_HEAD(tmp_list);
int rounds = 0;
long io_timeout = brick->power.io_timeout;
if (io_timeout <= 0)
io_timeout = global_net_io_timeout;
long io_timeout = _compute_timeout(brick);
if (!mars_net_is_alive)
force = true;