diff options
| author | George Melikov <mail@gmelikov.ru> | 2017-01-26 22:42:15 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2017-01-26 22:42:15 +0000 |
| commit | aeacdefedc31b498cfccc0026b83be0bab197a3b (patch) | |
| tree | c03760990ae655a0e17d55c7c81c793f608c9802 /lib/libzfs/libzfs_pool.c | |
| parent | 0a3d2673de4958094b5c178efd7bd991bcd84f3f (diff) | |
| download | src-aeacdefedc31b498cfccc0026b83be0bab197a3b.tar.gz src-aeacdefedc31b498cfccc0026b83be0bab197a3b.zip | |
OpenZFS 7386 - zfs get does not work properly with bookmarks
Authored by: Marcel Telka <marcel@telka.sk>
Reviewed by: Simon Klinkert <simon.klinkert@gmail.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Approved by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
OpenZFS-issue: https://www.illumos.org/issues/7386
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/edb901a
Closes #5666
Diffstat (limited to 'lib/libzfs/libzfs_pool.c')
| -rw-r--r-- | lib/libzfs/libzfs_pool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c index 76ada47d67c0..2e1d927511df 100644 --- a/lib/libzfs/libzfs_pool.c +++ b/lib/libzfs/libzfs_pool.c @@ -1031,9 +1031,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; case NAME_ERR_NO_AT: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, |