diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/zoneadmd/vplat.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libbrand/common/libbrand.c | 24 | ||||
| -rw-r--r-- | usr/src/lib/libbrand/common/libbrand.h | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c index 9d32485fad..4105cae1cc 100644 --- a/usr/src/cmd/zoneadmd/vplat.c +++ b/usr/src/cmd/zoneadmd/vplat.c @@ -1734,7 +1734,7 @@ mount_filesystems(zlog_t *zlogp, zone_mnt_t mount_cmd) cb.pgcd_zlogp = zlogp; cb.pgcd_fs_tab = &fs_ptr; cb.pgcd_num_fs = &num_fs; - if (brand_platform_iter_gmounts(bh, zonepath, + if (brand_platform_iter_gmounts(bh, zone_name, zonepath, plat_gmount_cb, &cb) != 0) { zerror(zlogp, B_FALSE, "unable to mount filesystems"); brand_close(bh); diff --git a/usr/src/lib/libbrand/common/libbrand.c b/usr/src/lib/libbrand/common/libbrand.c index 7d34df9e58..d0343acc47 100644 --- a/usr/src/lib/libbrand/common/libbrand.c +++ b/usr/src/lib/libbrand/common/libbrand.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, Joyent, Inc. All rights reserved. + * Copyright (c) 2015, Joyent, Inc. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. */ @@ -810,9 +810,9 @@ brand_config_iter_privilege(brand_handle_t bh, } static int -i_brand_platform_iter_mounts(struct brand_handle *bhp, const char *zonepath, - int (*func)(void *, const char *, const char *, const char *, - const char *), void *data, const xmlChar *mount_type) +i_brand_platform_iter_mounts(struct brand_handle *bhp, const char *zonename, + const char *zonepath, int (*func)(void *, const char *, const char *, + const char *, const char *), void *data, const xmlChar *mount_type) { xmlNodePtr node; xmlChar *special, *dir, *type, *opt; @@ -841,7 +841,7 @@ i_brand_platform_iter_mounts(struct brand_handle *bhp, const char *zonepath, /* Substitute token values as needed. */ if ((ret = i_substitute_tokens((char *)special, special_exp, sizeof (special_exp), - NULL, zonepath, NULL, NULL)) != 0) + zonename, zonepath, NULL, NULL)) != 0) goto next; /* opt might not be defined */ @@ -851,7 +851,7 @@ i_brand_platform_iter_mounts(struct brand_handle *bhp, const char *zonepath, } else { if ((ret = i_substitute_tokens((char *)opt, opt_exp, sizeof (opt_exp), - NULL, zonepath, NULL, NULL)) != 0) + zonename, zonepath, NULL, NULL)) != 0) goto next; } @@ -885,13 +885,13 @@ next: * %R Zonepath of zone */ int -brand_platform_iter_gmounts(brand_handle_t bh, const char *zonepath, - int (*func)(void *, const char *, const char *, const char *, - const char *), void *data) +brand_platform_iter_gmounts(brand_handle_t bh, const char *zonename, + const char *zonepath, int (*func)(void *, const char *, const char *, + const char *, const char *), void *data) { struct brand_handle *bhp = (struct brand_handle *)bh; - return (i_brand_platform_iter_mounts(bhp, zonepath, func, data, - DTD_ELEM_GLOBAL_MOUNT)); + return (i_brand_platform_iter_mounts(bhp, zonename, zonepath, func, + data, DTD_ELEM_GLOBAL_MOUNT)); } /* @@ -905,7 +905,7 @@ brand_platform_iter_mounts(brand_handle_t bh, int (*func)(void *, const char *, const char *, const char *, const char *), void *data) { struct brand_handle *bhp = (struct brand_handle *)bh; - return (i_brand_platform_iter_mounts(bhp, NULL, func, data, + return (i_brand_platform_iter_mounts(bhp, NULL, NULL, func, data, DTD_ELEM_MOUNT)); } diff --git a/usr/src/lib/libbrand/common/libbrand.h b/usr/src/lib/libbrand/common/libbrand.h index 5c5fb1b42e..30accf95ba 100644 --- a/usr/src/lib/libbrand/common/libbrand.h +++ b/usr/src/lib/libbrand/common/libbrand.h @@ -21,7 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, Joyent, Inc. All rights reserved. + * Copyright (c) 2015, Joyent, Inc. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. */ @@ -106,8 +106,8 @@ extern int brand_config_iter_privilege(brand_handle_t, extern int brand_platform_iter_devices(brand_handle_t, const char *, int (*)(void *, const char *, const char *), void *, const char *); extern int brand_platform_iter_gmounts(brand_handle_t, const char *, - int (*)(void *, const char *, const char *, const char *, const char *), - void *); + const char *, int (*)(void *, const char *, const char *, const char *, + const char *), void *); extern int brand_platform_iter_link(brand_handle_t, int (*)(void *, const char *, const char *), void *); extern int brand_platform_iter_mounts(brand_handle_t, int (*)(void *, |