View | Details | Raw Unified | Return to bug 221067
Collapse All | Expand All

(-)/home/david/sandspace/private-freebsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c (+10 lines)
Lines 80-85 Link Here
80
#include <sys/callb.h>
80
#include <sys/callb.h>
81
#include <sys/cpupart.h>
81
#include <sys/cpupart.h>
82
#include <sys/zone.h>
82
#include <sys/zone.h>
83
#include <sys/systm.h>
83
#endif	/* _KERNEL */
84
#endif	/* _KERNEL */
84
85
85
#include "zfs_prop.h"
86
#include "zfs_prop.h"
Lines 2315-2320 Link Here
2315
	if (!mosconfig)
2316
	if (!mosconfig)
2316
		spa->spa_mode = FREAD;
2317
		spa->spa_mode = FREAD;
2317
2318
2319
	if (spa_is_root(spa)) {
2320
		char *s;
2321
		s = kern_getenv("vfs.root.mountfrom.options");
2322
		if (spa->spa_mode != FREAD && strcmp(s, "ro") == 0) {
2323
			spa->spa_mode = FREAD;
2324
		} 
2325
		freeenv(s);
2326
	}
2327
2318
	ASSERT(MUTEX_HELD(&spa_namespace_lock));
2328
	ASSERT(MUTEX_HELD(&spa_namespace_lock));
2319
2329
2320
	spa->spa_load_state = state;
2330
	spa->spa_load_state = state;

Return to bug 221067