ffs -> ufs

This commit is contained in:
mycroft 1995-11-11 22:00:15 +00:00
parent c7d1d39b3e
commit 7edc899fdd
4 changed files with 15 additions and 15 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_conf.c,v 1.21 1994/06/29 06:33:52 cgd Exp $ */
/* $NetBSD: vfs_conf.c,v 1.22 1995/11/11 22:00:15 mycroft Exp $ */
/*
* Copyright (c) 1989, 1993
@ -50,7 +50,7 @@ struct vnode *rootvnode;
* The types are defined in mount.h.
*/
#ifdef FFS
extern struct vfsops ufs_vfsops;
extern struct vfsops ffs_vfsops;
#endif
#ifdef LFS
@ -116,7 +116,7 @@ extern struct vfsops adosfs_vfsops;
struct vfsops *vfssw[] = {
NULL, /* 0 = MOUNT_NONE */
#ifdef FFS
&ufs_vfsops, /* 1 = MOUNT_UFS */
&ffs_vfsops, /* 1 = MOUNT_FFS */
#else
NULL,
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_syscalls.c,v 1.58 1995/11/07 22:41:02 gwr Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.59 1995/11/11 22:00:18 mycroft Exp $ */
/*
* Copyright (c) 1989, 1993
@ -185,10 +185,9 @@ sys_mount(p, v, retval)
#endif
}
#ifdef COMPAT_10
/* Accept "ufs" as an alias for "ffs" */
if (!strncmp(fstypename, "ufs", MFSNAMELEN)) {
/* Accept `ufs' as an alias for `ffs'. */
if (!strncmp(fstypename, "ufs", MFSNAMELEN))
strncpy(fstypename, "ffs", MFSNAMELEN);
}
#endif
for (fsindex = 0; fsindex < nvfssw; fsindex++)
if (vfssw[fsindex] != NULL &&

View File

@ -1,4 +1,4 @@
/* $NetBSD: mount.h,v 1.43 1995/10/15 15:33:26 ws Exp $ */
/* $NetBSD: mount.h,v 1.44 1995/11/11 22:00:21 mycroft Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@ -82,7 +82,8 @@ struct statfs {
/*
* File system types.
*/
#define MOUNT_UFS "ufs" /* UNIX "Fast" Filesystem */
#define MOUNT_FFS "ffs" /* UNIX "Fast" Filesystem */
#define MOUNT_UFS MOUNT_FFS /* for compatibility */
#define MOUNT_NFS "nfs" /* Network Filesystem */
#define MOUNT_MFS "mfs" /* Memory Filesystem */
#define MOUNT_MSDOS "msdos" /* MSDOS Filesystem */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.16 1995/06/18 14:48:22 cgd Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.17 1995/11/11 22:00:23 mycroft Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -63,8 +63,8 @@
int ffs_sbupdate __P((struct ufsmount *, int));
struct vfsops ufs_vfsops = {
MOUNT_UFS,
struct vfsops ffs_vfsops = {
MOUNT_FFS,
ffs_mount,
ufs_start,
ffs_unmount,
@ -105,7 +105,7 @@ ffs_mountroot()
mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
bzero((char *)mp, (u_long)sizeof(struct mount));
mp->mnt_op = &ufs_vfsops;
mp->mnt_op = &ffs_vfsops;
mp->mnt_flag = MNT_RDONLY;
if (error = ffs_mountfs(rootvp, mp, p)) {
free(mp, M_MOUNT);
@ -487,7 +487,7 @@ ffs_mountfs(devvp, mp, p)
}
mp->mnt_data = (qaddr_t)ump;
mp->mnt_stat.f_fsid.val[0] = (long)dev;
mp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_UFS);
mp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_FFS);
mp->mnt_maxsymlinklen = fs->fs_maxsymlinklen;
mp->mnt_flag |= MNT_LOCAL;
ump->um_mountp = mp;