Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh	(revision 329232)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh	(revision 329233)
@@ -1,107 +1,102 @@
 #!/usr/local/bin/ksh93 -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"@(#)zpool_upgrade_004_pos.ksh	1.6	09/06/22 SMI"
 #
 #
 
 . $STF_SUITE/include/libtest.kshlib
 . $STF_SUITE/tests/cli_root/zpool_upgrade/zpool_upgrade.kshlib
 
 ################################################################################
 #
 # __stc_assertion_start
 #
 # ID: zpool_upgrade_004_pos
 #
 # DESCRIPTION:
 # zpool upgrade -a works
 #
 # STRATEGY:
 # 1. Create all upgradable pools for this system, then upgrade -a
 # 2. Verify a 0 exit status
 #
 # TESTABILITY: explicit
 #
 # TEST_AUTOMATION_LEVEL: automated
 #
 # CODING_STATUS: COMPLETED (2006-06-07)
 #
 # __stc_assertion_end
 #
 ################################################################################
 
 verify_runnable "global"
 
 function cleanup
 {
 	for config in $CONFIGS ; do
 		destroy_upgraded_pool $config
 	done
 }
 
 log_assert "zpool upgrade -a works"
 
-$DF -F zfs / > /dev/null 2>&1
-if (( $? == 0 )); then
-	log_unsupported "This case should not run on ZFS root system"
-fi
-
 log_onexit cleanup
 
 # Now build all of our pools
 for config in $CONFIGS
 do
 	POOL_NAME=$($ENV | $GREP "ZPOOL_VERSION_${config}_NAME"\
 		| $AWK -F= '{print $2}')
 
 	create_old_pool $config
 	# a side effect of the check_pool here, is that we get a checksum written
 	# called $TMPDIR/pool-checksums.$POOL.pre
 	check_pool $POOL_NAME pre > /dev/null
 done
 
 # upgrade them all at once
 log_must $ZPOOL upgrade -a > /dev/null
 
 # verify their contents then destroy them
 for config in $CONFIGS
 do
 	POOL_NAME=$($ENV | $GREP "ZPOOL_VERSION_${config}_NAME"\
 		| $AWK -F= '{print $2}')
 
 	check_pool $POOL_NAME post > /dev/null
 
 	# a side effect of the check_pool here, is that we get a checksum written
 	# called $TMPDIR/pool-checksums.$POOL_NAME.post
 	log_must $DIFF $TMPDIR/pool-checksums.$POOL_NAME.pre \
 		$TMPDIR/pool-checksums.$POOL_NAME.post
 
 	$RM $TMPDIR/pool-checksums.$POOL_NAME.pre $TMPDIR/pool-checksums.$POOL_NAME.post
 	destroy_upgraded_pool $config
 done
 
 log_pass "zpool upgrade -a works"