Author: avg
Date: Sun Dec 23 12:19:07 2012
New Revision: 244624
URL: http://svnweb.freebsd.org/changeset/base/244624
Log:
MFC r242567: zfs_mount: drop vfs.zfs.rootpool.prefer_cached_config tunable
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Sun Dec 23 12:16:24 2012 (r244623)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Sun Dec 23 12:19:07 2012 (r244624)
@@ -1656,24 +1656,12 @@ zfs_mount(vfs_t *vfsp)
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);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
