svn commit: r330236 - head/sys/compat/linuxkpi/common/src

[Hans Petter Selasky]

Author: hselasky
Date: Thu Mar  1 10:31:51 2018
New Revision: 330236
URL: https://svnweb.freebsd.org/changeset/base/330236

Log:
  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

Modified:
  head/sys/compat/linuxkpi/common/src/linux_work.c

Modified: head/sys/compat/linuxkpi/common/src/linux_work.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_work.c    Thu Mar  1 08:33:20 
2018        (r330235)
+++ head/sys/compat/linuxkpi/common/src/linux_work.c    Thu Mar  1 10:31:51 
2018        (r330236)
@@ -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);
        }
 }
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"