summaryrefslogtreecommitdiff
path: root/sys/msdosfs
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-05-01 23:47:22 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-05-01 23:47:22 +0000
commitf2404a66800283ab007babadc7d3f0edf63770d9 (patch)
tree426c2a9100b7d92cd6567279efd99ee5972ee28b /sys/msdosfs
parent3e490524805e5f4207c7ebbcb8c25fee8e03f002 (diff)
do not count on BOOTSIG0 and BOOTSIG1 being in a msdos filesystem. Not
all filesystems need to contain those; mark@nfr.net
Diffstat (limited to 'sys/msdosfs')
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index f575d850f46..a1edd0159b9 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vfsops.c,v 1.16 1999/01/10 21:53:02 art Exp $ */
+/* $OpenBSD: msdosfs_vfsops.c,v 1.17 1999/05/01 23:47:21 deraadt Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */
/*-
@@ -327,13 +327,6 @@ msdosfs_mountfs(devvp, mp, p, argp)
b33 = (struct byte_bpb33 *)bsp->bs33.bsBPB;
b50 = (struct byte_bpb50 *)bsp->bs50.bsBPB;
b710 = (struct byte_bpb710 *)bsp->bs710.bsPBP;
- if (!(argp->flags & MSDOSFSMNT_GEMDOSFS)) {
- if (bsp->bs50.bsBootSectSig0 != BOOTSIG0
- || bsp->bs50.bsBootSectSig1 != BOOTSIG1) {
- error = EINVAL;
- goto error_exit;
- }
- }
pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK);
bzero((caddr_t)pmp, sizeof *pmp);
@@ -382,11 +375,8 @@ msdosfs_mountfs(devvp, mp, p, argp)
}
if (pmp->pm_RootDirEnts == 0) {
- if (bsp->bs710.bsBootSectSig2 != BOOTSIG2
- || bsp->bs710.bsBootSectSig3 != BOOTSIG3
- || pmp->pm_Sectors
- || pmp->pm_FATsecs
- || getushort(b710->bpbFSVers)) {
+ if (pmp->pm_Sectors || pmp->pm_FATsecs ||
+ getushort(b710->bpbFSVers)) {
error = EINVAL;
goto error_exit;
}