Commit b44247b1 authored by Hans Petter Selasky's avatar Hans Petter Selasky
Browse files

Correct the return value from flush_work() and flush_delayed_work() in the

LinuxKPI to comply more with Linux. This fixes an issue when these functions
are used in waiting loops.

MFC after:	1 week
Sponsored by:	Mellanox Technologies
parent 5903f595
......@@ -454,6 +454,7 @@ bool
linux_flush_work(struct work_struct *work)
{
struct taskqueue *tq;
int retval;
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
"linux_flush_work() might sleep");
......@@ -463,8 +464,9 @@ linux_flush_work(struct work_struct *work)
return (0);
default:
tq = work->work_queue->taskqueue;
retval = taskqueue_poll_is_busy(tq, &work->work_task);
taskqueue_drain(tq, &work->work_task);
return (1);
return (retval);
}
}
......@@ -477,6 +479,7 @@ bool
linux_flush_delayed_work(struct delayed_work *dwork)
{
struct taskqueue *tq;
int retval;
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
"linux_flush_delayed_work() might sleep");
......@@ -490,8 +493,9 @@ linux_flush_delayed_work(struct delayed_work *dwork)
/* FALLTHROUGH */
default:
tq = dwork->work.work_queue->taskqueue;
retval = taskqueue_poll_is_busy(tq, &dwork->work.work_task);
taskqueue_drain(tq, &dwork->work.work_task);
return (1);
return (retval);
}
}
......
Supports Markdown
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