diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-23 13:25:43 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-23 13:25:43 +0000 |
| commit | d3d31ab6f2a28d67593b8dcad42c0f03964ab6c0 (patch) | |
| tree | 9f6711836b72b99b8d94d2300e585e659d35b984 /usr/src/cmd | |
| parent | 3f9daf6d27ccf52cc878e4bee17bf6f657f6f50d (diff) | |
| parent | e014e7f89c5273294b22953615734b04c11b1b4f (diff) | |
| download | illumos-joyent-d3d31ab6f2a28d67593b8dcad42c0f03964ab6c0.tar.gz | |
[illumos-gate merge]
commit e014e7f89c5273294b22953615734b04c11b1b4f
6641 deadman fires spuriously when running on VMware
commit 8808ac5dae118369991f158b6ab736cb2691ecde
4521 zfstest is trying to execute evil "zfs unmount -a"
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index 8f38a11ba5..91697fa896 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -25,9 +25,9 @@ * Copyright 2012 Milan Jurik. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Integros [integros.com] * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>. + * Copyright 2016 Nexenta Systems, Inc. */ #include <assert.h> @@ -6456,6 +6456,15 @@ unshare_unmount(int op, int argc, char **argv) continue; } + /* + * Ignore datasets that are excluded/restricted by + * parent pool name. + */ + if (zpool_skip_pool(zfs_get_pool_name(zhp))) { + zfs_close(zhp); + continue; + } + switch (op) { case OP_SHARE: verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS, |