Module Name: src
Committed By: kardel
Date: Fri Oct 9 08:18:01 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: dmu_tx.c
Log Message:
PR kern/55705:
don't attempt to sleep for negative time, we are late anyway - avoids
DIAGNOSTIC panic
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.6
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.5 Mon Mar 9 15:37:46 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c Fri Oct 9 08:18:01 2020
@@ -1153,6 +1153,9 @@ dmu_tx_delay(dmu_tx_t *tx, uint64_t dirt
#ifdef __NetBSD__
int timo = (wakeup - now) * hz / 1000000000;
+ if (timo < 0)
+ return;
+
if (timo == 0)
timo = 1;
kpause("dmu_tx_delay", false, timo, NULL);
