diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-30 17:33:08 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-30 17:33:08 +0000 |
| commit | e5eca69f4b721e7e2209d18b3358d79069be9024 (patch) | |
| tree | 10281da4c59357b0ca0f9a89d716be080ed4c7ab /usr/src/lib/libdlpi/common/libdlpi.c | |
| parent | e7a35eac19dab0d7a03157433255ec4d9ee9c60a (diff) | |
| parent | 19449258028e6813f0b7a606b554b2fa37a390ec (diff) | |
| download | illumos-joyent-e5eca69f4b721e7e2209d18b3358d79069be9024.tar.gz | |
[illumos-gate merge]
commit 19449258028e6813f0b7a606b554b2fa37a390ec
4823 don't open-code NSEC2MSEC and MSEC2NSEC
commit cb3e7fb42f8104f779abb6856ccf6e5b8e6419d8
4819 fix mpt_sas command timeout handling
commit b59e2127f21675e88c58a4dd924bc55eeb83c7a6
4809 NANOSEC should be 'long long' to avoid integer overflow bugs
4810 spa_async_tasks_pending suffers from an integer overflow bug
4811 in.mpathd: tv2ns suffers from an integer overflow bug
Diffstat (limited to 'usr/src/lib/libdlpi/common/libdlpi.c')
| -rw-r--r-- | usr/src/lib/libdlpi/common/libdlpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libdlpi/common/libdlpi.c b/usr/src/lib/libdlpi/common/libdlpi.c index 1ec147270a..aa97afee04 100644 --- a/usr/src/lib/libdlpi/common/libdlpi.c +++ b/usr/src/lib/libdlpi/common/libdlpi.c @@ -1383,7 +1383,7 @@ i_dlpi_strgetmsg(dlpi_impl_t *dip, int msec, dlpi_msg_t *dlreplyp, for (;;) { if (!infinite) - start = gethrtime() / (NANOSEC / MILLISEC); + start = NSEC2MSEC(gethrtime()); switch (poll(&pfd, 1, msec)) { default: @@ -1499,7 +1499,7 @@ i_dlpi_strgetmsg(dlpi_impl_t *dip, int msec, dlpi_msg_t *dlreplyp, } update_timer: if (!infinite) { - current = gethrtime() / (NANOSEC / MILLISEC); + current = NSEC2MSEC(gethrtime()); msec -= (current - start); if (msec <= 0) |