Deleted Added
full compact
vfs_init.c (225537) vfs_init.c (241896)
1/*-
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed
6 * to Berkeley by John Heidemann of the UCLA Ficus project.
7 *
8 * Source: * @(#)i405_init.c 2.10 92/04/27 UCLA Ficus project

--- 21 unchanged lines hidden (view full) ---

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94
35 */
36
37#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed
6 * to Berkeley by John Heidemann of the UCLA Ficus project.
7 *
8 * Source: * @(#)i405_init.c 2.10 92/04/27 UCLA Ficus project

--- 21 unchanged lines hidden (view full) ---

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94
35 */
36
37#include <sys/cdefs.h>
38__FBSDID("$FreeBSD: head/sys/kern/vfs_init.c 225537 2011-09-13 21:01:26Z rmacklem $");
38__FBSDID("$FreeBSD: head/sys/kern/vfs_init.c 241896 2012-10-22 17:50:54Z kib $");
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/fnv_hash.h>
43#include <sys/kernel.h>
44#include <sys/linker.h>
45#include <sys/mount.h>
46#include <sys/proc.h>

--- 114 unchanged lines hidden (view full) ---

161 }
162
163 if (vfc->vfc_version != VFS_VERSION) {
164 printf("ERROR: filesystem %s, unsupported ABI version %x\n",
165 vfc->vfc_name, vfc->vfc_version);
166 return (EINVAL);
167 }
168 if (vfs_byname(vfc->vfc_name) != NULL)
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/fnv_hash.h>
43#include <sys/kernel.h>
44#include <sys/linker.h>
45#include <sys/mount.h>
46#include <sys/proc.h>

--- 114 unchanged lines hidden (view full) ---

161 }
162
163 if (vfc->vfc_version != VFS_VERSION) {
164 printf("ERROR: filesystem %s, unsupported ABI version %x\n",
165 vfc->vfc_name, vfc->vfc_version);
166 return (EINVAL);
167 }
168 if (vfs_byname(vfc->vfc_name) != NULL)
169 return EEXIST;
169 return (EEXIST);
170
171 if (vfs_typenumhash != 0) {
172 /*
173 * Calculate a hash on vfc_name to use for vfc_typenum. Unless
174 * all of 1<->255 are assigned, it is limited to 8bits since
175 * that is what ZFS uses from vfc_typenum and is also the
176 * preferred range for vfs_getnewfsid().
177 */

--- 163 unchanged lines hidden ---
170
171 if (vfs_typenumhash != 0) {
172 /*
173 * Calculate a hash on vfc_name to use for vfc_typenum. Unless
174 * all of 1<->255 are assigned, it is limited to 8bits since
175 * that is what ZFS uses from vfc_typenum and is also the
176 * preferred range for vfs_getnewfsid().
177 */

--- 163 unchanged lines hidden ---