diff options
| author | George Melikov <[email protected]> | 2017-01-27 01:42:15 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-01-26 14:42:15 -0800 |
| commit | aeacdefedc31b498cfccc0026b83be0bab197a3b (patch) | |
| tree | c03760990ae655a0e17d55c7c81c793f608c9802 /include | |
| parent | 0a3d2673de4958094b5c178efd7bd991bcd84f3f (diff) | |
OpenZFS 7386 - zfs get does not work properly with bookmarks
Authored by: Marcel Telka <[email protected]>
Reviewed by: Simon Klinkert <[email protected]>
Reviewed by: Paul Dagnelie <[email protected]>
Approved by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7386
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/edb901a
Closes #5666
Diffstat (limited to 'include')
| -rw-r--r-- | include/zfs_namecheck.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/zfs_namecheck.h b/include/zfs_namecheck.h index cbefbaa0d..db70641db 100644 --- a/include/zfs_namecheck.h +++ b/include/zfs_namecheck.h @@ -38,7 +38,7 @@ typedef enum { NAME_ERR_EMPTY_COMPONENT, /* name contains an empty component */ NAME_ERR_TRAILING_SLASH, /* name ends with a slash */ NAME_ERR_INVALCHAR, /* invalid character found */ - NAME_ERR_MULTIPLE_AT, /* multiple '@' characters found */ + NAME_ERR_MULTIPLE_DELIMITERS, /* multiple '@'/'#' delimiters found */ NAME_ERR_NOLETTER, /* pool doesn't begin with a letter */ NAME_ERR_RESERVED, /* entire name is reserved */ NAME_ERR_DISKLIKE, /* reserved disk name (c[0-9].*) */ @@ -49,6 +49,7 @@ typedef enum { #define ZFS_PERMSET_MAXLEN 64 int pool_namecheck(const char *, namecheck_err_t *, char *); +int entity_namecheck(const char *, namecheck_err_t *, char *); int dataset_namecheck(const char *, namecheck_err_t *, char *); int mountpoint_namecheck(const char *, namecheck_err_t *); int zfs_component_namecheck(const char *, namecheck_err_t *, char *); |