[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs PR kern/55705:

[kardel <kardel%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e36c947a0d1b
branches:  trunk
changeset: 976934:e36c947a0d1b
user:      kardel <kardel%NetBSD.org@localhost>
date:      Fri Oct 09 08:18:01 2020 +0000

description:
PR kern/55705:
don't attempt to sleep for negative time, we are late anyway - avoids DIAGNOSTIC panic

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r db17a249daee -r e36c947a0d1b external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c       Fri Oct 09 08:10:41 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c       Fri Oct 09 08:18:01 2020 +0000
@@ -1153,6 +1153,9 @@
 #ifdef __NetBSD__
        int timo = (wakeup - now) * hz / 1000000000;
 
+       if (timo < 0)
+               return;
+
        if (timo == 0)
                timo = 1;
        kpause("dmu_tx_delay", false, timo, NULL);