diff options
| author | Garrett D'Amore <garrett@nexenta.com> | 2011-01-17 21:18:02 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@nexenta.com> | 2011-01-17 21:18:02 -0800 |
| commit | a3002e0aebb2c7fba71fcbbba97ad98ab8340dc4 (patch) | |
| tree | c4f7f969522c297a0eba75618bb3c946c9118123 /usr/src/cmd/zoneadmd/vplat.c | |
| parent | 475b496bc008381e64c802250441cc256622ce91 (diff) | |
| download | illumos-joyent-a3002e0aebb2c7fba71fcbbba97ad98ab8340dc4.tar.gz | |
419 zpool/zfs incosistencies inside a non-global zone
Reviewed by: panamayacht@gmail.com
Approved by: gwr@nexenta.com
Diffstat (limited to 'usr/src/cmd/zoneadmd/vplat.c')
| -rw-r--r-- | usr/src/cmd/zoneadmd/vplat.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c index 9e4dca604d..df81c54c96 100644 --- a/usr/src/cmd/zoneadmd/vplat.c +++ b/usr/src/cmd/zoneadmd/vplat.c @@ -24,6 +24,10 @@ */ /* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + */ + +/* * This module contains functions used to bring up and tear down the * Virtual Platform: [un]mounting file-systems, [un]plumbing network * interfaces, [un]configuring devices, establishing resource controls, @@ -2515,10 +2519,10 @@ add_datalink(zlog_t *zlogp, char *zone_name, datalink_id_t linkid, char *dlname) if (err != DLADM_STATUS_OK) { zerror(zlogp, B_FALSE, "WARNING: unable to set " "pool %s to datalink %s", pool_name, dlname); - bzero(pool_name, MAXPATHLEN); + bzero(pool_name, sizeof (pool_name)); } } else { - bzero(pool_name, MAXPATHLEN); + bzero(pool_name, sizeof (pool_name)); } return (0); } @@ -3046,7 +3050,7 @@ remove_datalink_pool(zlog_t *zlogp, zoneid_t zoneid) return (-1); } - bzero(pool_name, MAXPATHLEN); + bzero(pool_name, sizeof (pool_name)); for (i = 0, dllink = dllinks; i < dlnum; i++, dllink++) { err = dladm_set_linkprop(dld_handle, *dllink, "pool", NULL, 0, DLADM_OPT_ACTIVE); @@ -4520,7 +4524,8 @@ setup_zone_rm(zlog_t *zlogp, char *zone_name, zoneid_t zoneid) } /* Update saved pool name in case it has changed */ - (void) zonecfg_get_poolname(handle, zone_name, pool_name, MAXPATHLEN); + (void) zonecfg_get_poolname(handle, zone_name, pool_name, + sizeof (pool_name)); zonecfg_fini_handle(handle); return (Z_OK); |