d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure the linux_wait_event_common() function in the LinuxKPI properly

Browse Source 
handles a timeout value of MAX_SCHEDULE_TIMEOUT which basically means there
is no timeout. This is a regression issue after r319757.

While at it change the type of returned variable from "long" to "int" to
match the actual return type.

MFC after:	1 week
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2017-08-10 12:51:04 +00:00
parent aa6a25dc8e
commit 8ea4441598
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/compat/linuxkpi/common/src/linux_schedule.c
View File

@ -213,13 +213,19 @@ linux_wait_event_common(wait_queue_head_t *wqh, wait_queue_t *wq, int timeout,
unsigned int state, spinlock_t *lock)
{
struct task_struct *task;
long ret;
int ret;
if (lock != NULL)
spin_unlock_irq(lock);
DROP_GIANT();
/* range check timeout */
if (timeout < 1)
timeout = 1;
else if (timeout == MAX_SCHEDULE_TIMEOUT)
timeout = 0;
task = current;
/*