diff options
| -rw-r--r-- | sys/kern/vfs_conf.c | 6 | ||||
| -rw-r--r-- | sys/sys/mount.h | 5 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 10 | ||||
| -rw-r--r-- | usr.sbin/pstat/pstat.c | 6 |
4 files changed, 14 insertions, 13 deletions
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index b265cb3eedb..ff0f0e19f9d 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -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.21.4.1 1995/11/01 00:06:26 jtc 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 diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 06d49fdddf0..e4de613a41f 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $NetBSD: mount.h,v 1.42 1995/06/29 10:05:16 cgd Exp $ */ +/* $NetBSD: mount.h,v 1.42.2.1 1995/11/01 00:06:31 jtc 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" /* Berkeley "Fast" Filesystem */ +#define MOUNT_UFS MOUNT_FFS #define MOUNT_NFS "nfs" /* Network Filesystem */ #define MOUNT_MFS "mfs" /* Memory Filesystem */ #define MOUNT_MSDOS "msdos" /* MSDOS Filesystem */ diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 2e6f959cc5d..48eb6bddff3 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -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.16.2.1 1995/11/01 00:06:34 jtc 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; diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index 67618a85f06..a032fa9cf63 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; */ -static char *rcsid = "$Id: pstat.c,v 1.1 1995/10/18 08:48:01 deraadt Exp $"; +static char *rcsid = "$Id: pstat.c,v 1.2 1995/11/06 21:19:02 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -328,7 +328,7 @@ vnodemode() maddr = vp->v_mount; mount_print(mp); vnode_header(); - if (!strncmp(ST.f_fstypename, MOUNT_UFS, MFSNAMELEN) || + if (!strncmp(ST.f_fstypename, MOUNT_FFS, MFSNAMELEN) || !strncmp(ST.f_fstypename, MOUNT_MFS, MFSNAMELEN)) { ufs_header(); } else if (!strncmp(ST.f_fstypename, MOUNT_NFS, @@ -338,7 +338,7 @@ vnodemode() (void)printf("\n"); } vnode_print(evp->avnode, vp); - if (!strncmp(ST.f_fstypename, MOUNT_UFS, MFSNAMELEN) || + if (!strncmp(ST.f_fstypename, MOUNT_FFS, MFSNAMELEN) || !strncmp(ST.f_fstypename, MOUNT_MFS, MFSNAMELEN)) { ufs_print(vp); } else if (!strncmp(ST.f_fstypename, MOUNT_NFS, MFSNAMELEN)) { |