diff options
| author | Jason King <jason.king@joyent.com> | 2018-11-06 06:23:27 +0000 |
|---|---|---|
| committer | Jason King <jason.king@joyent.com> | 2020-03-20 06:21:16 +0000 |
| commit | 007f77c7d800323cdf03f3e1650b71b85ae67eb5 (patch) | |
| tree | 80864d645730bbace1d65b5213e42985a802dec9 /usr/src | |
| parent | 08a0f5ea09ca188edbadd95cfdfddc2160992ba4 (diff) | |
| download | illumos-joyent-007f77c7d800323cdf03f3e1650b71b85ae67eb5.tar.gz | |
mgerts feedback
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_ioctl.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/os/zone.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index 94cbe34d9f..ef850131db 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -2136,7 +2136,7 @@ zfs_zone_ds_matches_alias(const char *dataset, zone_dataset_t *zd) if (strlen(dataset) >= len && bcmp(dataset, zd->zd_dataset, len) == 0 && (dataset[len] == '\0' || dataset[len] == '/' || - dataset[len] == '@')) { + dataset[len] == '@' || dataset[len] == '#')) { return (B_TRUE); } diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c index 8293ff6ea3..401330b3df 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -7740,7 +7740,7 @@ zone_dataset_unalias_inzone(const char *alias, char *dataset, size_t sz, * dataset's system name is the same as the name the zone used * (ie, assume no aliasing is in effect). */ - if (found == B_FALSE) { + if (!found) { len = strlen(alias); if (len >= sz - 1) return (ENOSPC); @@ -7807,7 +7807,7 @@ zone_dataset_alias_inzone(const char *dataset, char *alias, size_t sz, } } - if (found == B_FALSE) + if (!found) return (EINVAL); if (zd->zd_alias == NULL) { |