diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-11-07 13:50:26 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-11-07 13:50:26 +0000 |
commit | 4fe7f4c3234fc70dbf4f005babab2d326b83098e (patch) | |
tree | 7a63739c147d492033b3d6b900bbe8c342915bd0 /usr/src/uts/common/io/hook.c | |
parent | b9e062ca08c34e1a9774695a14a3c31899d1f414 (diff) | |
parent | cf25223258f3cd568605b3e10c1432e5e93b2c5e (diff) | |
download | illumos-joyent-4fe7f4c3234fc70dbf4f005babab2d326b83098e.tar.gz |
[illumos-gate merge]release-20181108
commit cf25223258f3cd568605b3e10c1432e5e93b2c5e
9941 Noise from cfgadm plugins
commit 68c34d0407d130a7e8cb7dfb5394a985db03d785
9951 hook_stack_notify_unregister can leave stack locked
Conflicts:
usr/src/uts/common/io/hook.c
Diffstat (limited to 'usr/src/uts/common/io/hook.c')
-rw-r--r-- | usr/src/uts/common/io/hook.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/io/hook.c b/usr/src/uts/common/io/hook.c index cf075f27c9..6726f72147 100644 --- a/usr/src/uts/common/io/hook.c +++ b/usr/src/uts/common/io/hook.c @@ -754,7 +754,7 @@ hook_stack_notify_unregister(netstackid_t stackid, hook_notify_fn_t callback) } } else { /* - * hook_notify_register() should only fail if the callback has + * hook_notify_unregister() should only fail if the callback has * already been deleted (ESRCH). */ VERIFY3S(error, ==, ESRCH); |