Module Name: src Committed By: chs Date: Sun Jun 3 03:05:56 UTC 2018
Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: dmu_tx.c Log Message: avoid calling kpause() with a delay of 0. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ 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.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.3 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.2 Mon May 28 21:05:07 2018 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c Sun Jun 3 03:05:56 2018 @@ -1151,7 +1151,11 @@ dmu_tx_delay(dmu_tx_t *tx, uint64_t dirt zfs_delay_resolution_ns * SBT_1NS, C_ABSOLUTE); #endif #ifdef __NetBSD__ - kpause("dmu_tx_delay", false, (wakeup - now) * hz / 1000000000, NULL); + int timo = (wakeup - now) * hz / 1000000000; + + if (timo == 0) + timo = 1; + kpause("dmu_tx_delay", false, timo, NULL); #endif #else hrtime_t delta = wakeup - gethrtime();