diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2007-04-24 12:10:29 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2007-04-24 12:10:29 +0000 |
| commit | a79d1a8ec5e50be34bb29365a2d3de3e368d5643 (patch) | |
| tree | 9e312d2ba1d2dbca10ca3251c1d96af233dc988d /sys | |
| parent | db8c4c9661e4ae376cbd1d346d96ee5b6e5f0cc9 (diff) | |
Fix mounting of ffs2 via "mount -a". ffs2 is not separate from ffs
and should not have its own MOUNT_XXX define.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/mount.h | 3 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 20a2a013629..7c56f2fe44a 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.h,v 1.78 2007/03/21 13:44:04 pedro Exp $ */ +/* $OpenBSD: mount.h,v 1.79 2007/04/24 12:10:28 millert Exp $ */ /* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */ /* @@ -342,7 +342,6 @@ struct ostatfs { * File system types. */ #define MOUNT_FFS "ffs" /* UNIX "Fast" Filesystem */ -#define MOUNT_FFS2 "ffs2" /* UNIX "Fast" Filesystem, version 2 */ #define MOUNT_UFS MOUNT_FFS /* for compatibility */ #define MOUNT_NFS "nfs" /* Network Filesystem */ #define MOUNT_MFS "mfs" /* Memory Filesystem */ diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index f1bee59ccf9..c39df355cab 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.103 2007/04/11 15:17:46 thib Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.104 2007/04/24 12:10:28 millert Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -1114,13 +1114,7 @@ ffs_statfs(struct mount *mp, struct statfs *sbp, struct proc *p) bcopy(&mp->mnt_stat.mount_info.ufs_args, &sbp->mount_info.ufs_args, sizeof(struct ufs_args)); } - -#ifdef FFS2 - if (fs->fs_magic == FS_UFS2_MAGIC) - strncpy(sbp->f_fstypename, MOUNT_FFS2, MFSNAMELEN); - else -#endif - strncpy(sbp->f_fstypename, mp->mnt_vfc->vfc_name, MFSNAMELEN); + strncpy(sbp->f_fstypename, mp->mnt_vfc->vfc_name, MFSNAMELEN); return (0); } |