svn commit: r271934 - head/cddl/contrib/opensolaris/cmd/zpool
Steven Hartland
smh at FreeBSD.org
Sun Sep 21 19:31:20 UTC 2014
Author: smh
Date: Sun Sep 21 19:31:19 2014
New Revision: 271934
URL: http://svnweb.freebsd.org/changeset/base/271934
Log:
Output boot code warning when zpool upgrade -a is used to add features.
In the case where new features where enabled by a zpool upgrade -a the
boot code warning wasn't output.
Submitted by: Jan Kokemueller
MFC after: 3 days
Modified:
head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Sep 21 18:52:56 2014 (r271933)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Sep 21 19:31:19 2014 (r271934)
@@ -4524,7 +4524,8 @@ is_root_pool(zpool_handle_t *zhp)
}
static void
-root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) {
+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);
@@ -4623,7 +4624,7 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
#ifdef __FreeBSD__
root_pool_upgrade_check(zhp, cbp->cb_poolname,
sizeof(cbp->cb_poolname));
-#endif /* ___FreeBSD__ */
+#endif /* __FreeBSD__ */
printnl = B_TRUE;
#ifdef illumos
@@ -4647,6 +4648,10 @@ upgrade_cb(zpool_handle_t *zhp, void *ar
if (count > 0) {
cbp->cb_first = B_FALSE;
printnl = B_TRUE;
+#ifdef __FreeBSD__
+ root_pool_upgrade_check(zhp, cbp->cb_poolname,
+ sizeof(cbp->cb_poolname));
+#endif /* __FreeBSD__ */
/*
* If they did "zpool upgrade -a", then we could
* be doing ioctls to different pools. We need
@@ -4788,7 +4793,7 @@ upgrade_one(zpool_handle_t *zhp, void *d
#ifdef __FreeBSD__
root_pool_upgrade_check(zhp, cbp->cb_poolname,
sizeof(cbp->cb_poolname));
-#endif /* ___FreeBSD__ */
+#endif /* __FreeBSD__ */
}
if (cbp->cb_version >= SPA_VERSION_FEATURES) {
More information about the svn-src-head
mailing list