diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 12:46:03 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 12:46:03 +0000 |
| commit | 78121a0c3d633d344c4092336d357036c0e19f96 (patch) | |
| tree | c6691bd7e380d723ada73f9b61dc4ef7634ee081 /usr/src/uts/common/klm/klmmod.c | |
| parent | 471ea867225b8c01fb430e738f6cf835294c99fc (diff) | |
| parent | 19ee9cd1f5161e227951200cab5ecbff45fd5d71 (diff) | |
| download | illumos-joyent-78121a0c3d633d344c4092336d357036c0e19f96.tar.gz | |
[illumos-gate merge]
commit 19ee9cd1f5161e227951200cab5ecbff45fd5d71
12277 /proc/<PID>/fdinfo should resolve paths relative to current process
commit 52aec5b9758f6352670ab269980b437a987f4822
12276 smatch-clean sockfs
commit 0dfe541e13279d277d838d6a27e55188b9486cb1
11083 support NFS server in zone
commit d8ab6e129d75d7c3f21a7909bf811a3de65faea8
12235 Add libzutil for libzfs or libzpool consumers
commit fdefee4c75361dc5ea202f7e1f7c49f8a27ea043
12266 loader: rewrite zfs reader zap code to use malloc
commit 8af765f5897d30449b941438e8d833f02dac74f8
12252 remove sunfire-specific code from kstat(1m)
commit 34173ec8d0147391124bee4bbc60ac00807c0377
12284 errors in compress(1) and pack(1) man pages
Conflicts:
usr/src/uts/common/klm/nlm_impl.h
usr/src/uts/common/fs/nfs/nfs_server.c
usr/src/lib/Makefile
usr/src/cmd/fs.d/nfs/svc/nfs-server
Diffstat (limited to 'usr/src/uts/common/klm/klmmod.c')
| -rw-r--r-- | usr/src/uts/common/klm/klmmod.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/uts/common/klm/klmmod.c b/usr/src/uts/common/klm/klmmod.c index 58e0f2d874..02a0b49e66 100644 --- a/usr/src/uts/common/klm/klmmod.c +++ b/usr/src/uts/common/klm/klmmod.c @@ -93,6 +93,7 @@ lm_zone_init(zoneid_t zoneid) g->lockd_pid = 0; g->run_status = NLM_ST_DOWN; + g->nlm_zoneid = zoneid; nlm_globals_register(g); return (g); @@ -104,6 +105,8 @@ lm_zone_fini(zoneid_t zoneid, void *data) { struct nlm_globals *g = data; + nlm_globals_unregister(g); + ASSERT(avl_is_empty(&g->nlm_hosts_tree)); avl_destroy(&g->nlm_hosts_tree); mod_hash_destroy_idhash(g->nlm_hosts_hash); @@ -114,7 +117,6 @@ lm_zone_fini(zoneid_t zoneid, void *data) cv_destroy(&g->nlm_gc_finish_cv); mutex_destroy(&g->clean_lock); - nlm_globals_unregister(g); kmem_free(g, sizeof (*g)); } |