diff options
| author | Joyce McIntosh <joyce.mcintosh@nexenta.com> | 2018-03-01 10:18:07 -0800 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-12-02 16:53:49 -0500 |
| commit | b8dc1b43d204b714c2fda8dd4efd67de0c671db6 (patch) | |
| tree | d872e81b172805b6e375de9b9c9de34f3930be84 /usr/src/cmd/zfs | |
| parent | 69d9b1c5b0824b6e4feadaf289d68d945f0fbe6f (diff) | |
| download | illumos-gate-b8dc1b43d204b714c2fda8dd4efd67de0c671db6.tar.gz | |
11945 pool import performance regression due to repeated libshare initialization
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/cmd/zfs')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index cfed8bc4f8..bd2f7f4cfe 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -6849,6 +6849,30 @@ unshare_unmount(int op, int argc, char **argv) } /* + * Initialize libshare SA_INIT_SHARE_API_SELECTIVE here + * to avoid unnecessary load/unload of the libshare API + * per shared dataset downstream. + */ + if (op == OP_SHARE) { + get_all_cb_t dslist = { 0 }; + get_all_datasets(&dslist, B_FALSE); + + if (dslist.cb_used != 0) { + sa_init_selective_arg_t sharearg; + sharearg.zhandle_arr = dslist.cb_handles; + sharearg.zhandle_len = dslist.cb_used; + if ((ret = zfs_init_libshare_arg(g_zfs, + SA_INIT_SHARE_API_SELECTIVE, &sharearg)) != + SA_OK) { + (void) fprintf(stderr, gettext( + "Could not initialize libshare, " + "%d"), ret); + return (1); + } + } + } + + /* * Walk the AVL tree in reverse, unmounting each filesystem and * removing it from the AVL tree in the process. */ |