d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix reporting of root pool upgrade notice.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Martin Matuska 2012-07-31 17:28:28 +00:00
parent 8c08c07ac4
commit f45b531d72
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
View File

@ -4409,6 +4409,7 @@ typedef struct upgrade_cbdata {
char **cb_argv;
} upgrade_cbdata_t;
#ifdef __FreeBSD__
static int
is_root_pool(zpool_handle_t *zhp)
{
@ -4434,6 +4435,14 @@ is_root_pool(zpool_handle_t *zhp)
return (poolname != NULL && strcmp(poolname, zpool_get_name(zhp)) == 0);
}
static void
root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) {
if (poolname[0] == '\0' && is_root_pool(zhp))
(void) strlcpy(poolname, zpool_get_name(zhp), size);
}
#endif /* FreeBSD */
static int
upgrade_version(zpool_handle_t *zhp, uint64_t version)
{
@ -4524,12 +4533,8 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
if (ret != 0)
return (ret);
#ifdef __FreeBSD__
if (cbp->cb_poolname[0] == '\0' &&
is_root_pool(zhp)) {
(void) strlcpy(cbp->cb_poolname,
zpool_get_name(zhp),
root_pool_upgrade_check(zhp, cbp->cb_poolname,
sizeof(cbp->cb_poolname));
}
#endif /* ___FreeBSD__ */
printnl = B_TRUE;
@ -4682,17 +4687,12 @@ upgrade_one(zpool_handle_t *zhp, void *data)
if (cur_version != cbp->cb_version) {
printnl = B_TRUE;
ret = upgrade_version(zhp, cbp->cb_version);
if (ret != 0) {
#ifdef __FreeBSD__
if (cbp->cb_poolname[0] == '\0' &&
is_root_pool(zhp)) {
(void) strlcpy(cbp->cb_poolname,
zpool_get_name(zhp),
sizeof(cbp->cb_poolname));
}
#endif /* ___FreeBSD__ */
if (ret != 0)
return (ret);
}
#ifdef __FreeBSD__
root_pool_upgrade_check(zhp, cbp->cb_poolname,
sizeof(cbp->cb_poolname));
#endif /* ___FreeBSD__ */
}
if (cbp->cb_version >= SPA_VERSION_FEATURES) {
@ -4703,15 +4703,15 @@ upgrade_one(zpool_handle_t *zhp, void *data)
if (count != 0) {
printnl = B_TRUE;
#ifdef __FreeBSD__
root_pool_upgrade_check(zhp, cbp->cb_poolname,
sizeof(cbp->cb_poolname));
#endif /* __FreeBSD __*/
} else if (cur_version == SPA_VERSION) {
(void) printf(gettext("Pool '%s' already has all "
"supported features enabled.\n"),
zpool_get_name(zhp));
}
if (cbp->cb_poolname[0] == '\0' && is_root_pool(zhp)) {
(void) strlcpy(cbp->cb_poolname, zpool_get_name(zhp),
sizeof(cbp->cb_poolname));
}
}
if (printnl) {