From 007f77c7d800323cdf03f3e1650b71b85ae67eb5 Mon Sep 17 00:00:00 2001 From: Jason King Date: Tue, 6 Nov 2018 06:23:27 +0000 Subject: mgerts feedback --- usr/src/uts/common/fs/zfs/zfs_ioctl.c | 2 +- usr/src/uts/common/os/zone.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'usr/src') 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) { -- cgit v1.2.3