svn commit: r330401 - stable/11/sys/compat/linuxkpi/common/src

[Hans Petter Selasky]

Author: hselasky
Date: Sun Mar  4 19:15:24 2018
New Revision: 330401
URL: https://svnweb.freebsd.org/changeset/base/330401

Log:
  MFC r330236:
  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.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/11/sys/compat/linuxkpi/common/src/linux_work.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/src/linux_work.c
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/src/linux_work.c	Sun Mar  4 19:12:54 2018	(r330400)
+++ stable/11/sys/compat/linuxkpi/common/src/linux_work.c	Sun Mar  4 19:15:24 2018	(r330401)
@@ -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);
 	}
 }