[Midnightbsd-cvs] src [8537] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c: drop vfs.zfs.rootpool.prefer_cached_config tunable.

[laffer1 at midnightbsd.org]

Revision: 8537
          http://svnweb.midnightbsd.org/src/?rev=8537
Author:   laffer1
Date:     2016-09-19 09:51:26 -0400 (Mon, 19 Sep 2016)
Log Message:
-----------
drop vfs.zfs.rootpool.prefer_cached_config tunable.

Modified Paths:
--------------
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	2016-09-19 13:51:04 UTC (rev 8536)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	2016-09-19 13:51:26 UTC (rev 8537)
@@ -1656,24 +1656,12 @@
 	if ((vfsp->vfs_flag & MNT_ROOTFS) != 0 &&
 	    (vfsp->vfs_flag & MNT_UPDATE) == 0) {
 		char pname[MAXNAMELEN];
-		spa_t *spa;
-		int prefer_cache;
 
 		error = getpoolname(osname, pname);
+		if (error == 0)
+			error = spa_import_rootpool(pname);
 		if (error)
 			goto out;
-
-		prefer_cache = 1;
-		TUNABLE_INT_FETCH("vfs.zfs.rootpool.prefer_cached_config",
-		    &prefer_cache);
-		mutex_enter(&spa_namespace_lock);
-		spa = spa_lookup(pname);
-		mutex_exit(&spa_namespace_lock);
-		if (!prefer_cache || spa == NULL) {
-			error = spa_import_rootpool(pname);
-			if (error)
-				goto out;
-		}
 	}
 	DROP_GIANT();
 	error = zfs_domount(vfsp, osname);