Commit 3eaf9fcc authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: handle error returned from wait_event_timeout seltest timer

The function wait_event_timeout can fail and return an error. Handle
this case in stt_timer_main().
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea25f451
...@@ -170,20 +170,22 @@ stt_check_timers(unsigned long *last) ...@@ -170,20 +170,22 @@ stt_check_timers(unsigned long *last)
static int static int
stt_timer_main(void *arg) stt_timer_main(void *arg)
{ {
int rc = 0;
cfs_block_allsigs(); cfs_block_allsigs();
while (!stt_data.stt_shuttingdown) { while (!stt_data.stt_shuttingdown) {
stt_check_timers(&stt_data.stt_prev_slot); stt_check_timers(&stt_data.stt_prev_slot);
wait_event_timeout(stt_data.stt_waitq, rc = wait_event_timeout(stt_data.stt_waitq,
stt_data.stt_shuttingdown, stt_data.stt_shuttingdown,
cfs_time_seconds(STTIMER_SLOTTIME)); cfs_time_seconds(STTIMER_SLOTTIME));
} }
spin_lock(&stt_data.stt_lock); spin_lock(&stt_data.stt_lock);
stt_data.stt_nthreads--; stt_data.stt_nthreads--;
spin_unlock(&stt_data.stt_lock); spin_unlock(&stt_data.stt_lock);
return 0; return rc;
} }
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment