diff options
| author | Dan McDonald <danmcd@joyent.com> | 2017-12-08 15:50:57 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2017-12-11 15:06:27 -0500 |
| commit | a5637b14d727171abf87f2f4b7601781b6c8d43c (patch) | |
| tree | 2c2302d4969e03529d10875dc0f7e239aaa89c3a /usr/src | |
| parent | 5c0bd3fc9bce3c684e60fe0c4c70ed3aa1ec2461 (diff) | |
| download | illumos-joyent-a5637b14d727171abf87f2f4b7601781b6c8d43c.tar.gz | |
OS-6501 LX netstack-hold code needs to correspond to OS-6441 fixes
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/brand/lx/procfs/lx_prsubr.c | 10 | ||||
| -rw-r--r-- | usr/src/uts/common/brand/lx/sysfs/lx_syssubr.c | 11 |
2 files changed, 2 insertions, 19 deletions
diff --git a/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c b/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c index 08d40a4a67..07dc432329 100644 --- a/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c +++ b/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c @@ -284,15 +284,7 @@ retry: netstack_t * lxpr_netstack(lxpr_node_t *lxpnp) { - netstack_t *ns; - - ns = LXPTOZ(lxpnp)->zone_netstack; - ASSERT(ns != NULL); - if (ns->netstack_flags & (NSF_UNINIT | NSF_CLOSING)) - return (NULL); - - netstack_hold(ns); - return (ns); + return (netstack_hold_if_active(LXPTOZ(lxpnp)->zone_netstack)); } /* diff --git a/usr/src/uts/common/brand/lx/sysfs/lx_syssubr.c b/usr/src/uts/common/brand/lx/sysfs/lx_syssubr.c index e80acbcfe5..69234ddbaa 100644 --- a/usr/src/uts/common/brand/lx/sysfs/lx_syssubr.c +++ b/usr/src/uts/common/brand/lx/sysfs/lx_syssubr.c @@ -281,17 +281,8 @@ netstack_t * lxsys_netstack(lxsys_node_t *lnp) { zone_t *zone = VTOLXSM(LXSTOV(lnp))->lxsysm_zone; - netstack_t *ns = zone->zone_netstack; - VERIFY(ns != NULL); - - if (ns->netstack_flags & (NSF_UNINIT|NSF_CLOSING)) { - ns = NULL; - } else { - netstack_hold(ns); - } - - return (ns); + return (netstack_hold_if_active(zone->zone_netstack)); } ill_t * |