diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-22 12:56:16 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-22 12:56:16 +0000 |
| commit | dec418ad77ca1ad8b6560e627d4f4d4cee27ab5c (patch) | |
| tree | 8b010779fbe156ed1462f203170b948386ec6023 /usr/src/lib/libzfs/common/libzfs_pool.c | |
| parent | 0e094404f4a199a440ac665b3442f89891352798 (diff) | |
| parent | 90f2c094b3822f4825f21cef2c2faf7d03b55139 (diff) | |
| download | illumos-joyent-dec418ad77ca1ad8b6560e627d4f4d4cee27ab5c.tar.gz | |
[illumos-gate merge]
commit 90f2c094b3822f4825f21cef2c2faf7d03b55139
7181 race between zfs_mount and zfs_ioc_rollback
commit 3faa67c4f6f8f33a78fe84ef48445aeb0ce858d3
7566 Add kernel environment variables under smbios.system.
commit c079fa4d202eff15e318131c52755d214ffa2da7
6428 set canmount=off on unmounted filesystem tries to unmount children
commit bfaed0b91e57062c38bc16b4f89db3c8f0052a9b
7199 dsl_dataset_rollback_sync may try to free already free blocks
7200 no blocks must be born in a txg after a snaphot is created
commit edb901aab9c738b5eb15aa55933e82b0f2f9d9a2
7386 zfs get does not work properly with bookmarks
commit 690041b9caf801816f2d0bac90bc7cecefb73523
7180 potential race between zfs_suspend_fs+zfs_resume_fs and zfs_ioc_rename
commit e5b103bba9ae456b34ffc1e123d7e81d4584a945
7596 iwn: Firmware update for 6205 (Taylor Peak)
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_pool.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_pool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_pool.c b/usr/src/lib/libzfs/common/libzfs_pool.c index c6f7d5d88c..325adb2c4f 100644 --- a/usr/src/lib/libzfs/common/libzfs_pool.c +++ b/usr/src/lib/libzfs/common/libzfs_pool.c @@ -947,9 +947,10 @@ zpool_name_valid(libzfs_handle_t *hdl, boolean_t isopen, const char *pool) "trailing slash in name")); break; - case NAME_ERR_MULTIPLE_AT: + case NAME_ERR_MULTIPLE_DELIMITERS: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "multiple '@' delimiters in name")); + "multiple '@' and/or '#' delimiters in " + "name")); break; default: |