D52037.id160778.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52037.id160778.diff
View Options

	diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
	--- a/sys/kern/vfs_init.c
	+++ b/sys/kern/vfs_init.c
	@@ -387,7 +387,7 @@
	static int once;
	struct vfsconf *tvfc;
	uint32_t hashval;
	- int secondpass;
	+ int error, prevmaxconf, secondpass;

	if (!once) {
	vattr_null(&va_null);
	@@ -405,6 +405,7 @@
	return (EEXIST);
	}

	+ prevmaxconf = maxvfsconf;
	if (vfs_typenumhash != 0) {
	/*
	* Calculate a hash on vfc_name to use for vfc_typenum. Unless
	@@ -497,16 +498,24 @@
	vfc->vfc_vfsops = &vfsops_sigdefer;
	}

	- if (vfc->vfc_flags & VFCF_JAIL)
	- prison_add_vfs(vfc);
	-
	/*
	* Call init function for this VFS...
	*/
	if ((vfc->vfc_flags & VFCF_SBDRY) != 0)
	- vfc->vfc_vfsops_sd->vfs_init(vfc);
	+ error = vfc->vfc_vfsops_sd->vfs_init(vfc);
	else
	- vfc->vfc_vfsops->vfs_init(vfc);
	+ error = vfc->vfc_vfsops->vfs_init(vfc);
	+
	+ if (error != 0) {
	+ maxvfsconf = prevmaxconf;
	+ TAILQ_REMOVE(&vfsconf, vfc, vfc_list);
	+ vfsconf_unlock();
	+ return (error);
	+ }
	+
	+ if ((vfc->vfc_flags & VFCF_JAIL) != 0)
	+ prison_add_vfs(vfc);
	+
	vfsconf_unlock();

	/*