diff options
| -rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 7 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 18ff3f4..9e661a6 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.45 1998/10/25 19:26:18 bde Exp $ + * $Id: cd9660_vfsops.c,v 1.46 1998/12/06 11:36:24 jkh Exp $ */ #include <sys/param.h> @@ -141,8 +141,6 @@ iso_get_ssector(dev, p) return ntohl(t.entry.addr.lba); } -#ifndef VFS_LKM /* mount root makes no sense to an LKM */ - static int iso_mountroot __P((struct mount *mp, struct proc *p)); static int @@ -168,7 +166,6 @@ iso_mountroot(mp, p) (void)cd9660_statfs(mp, &mp->mnt_stat, p); return (0); } -#endif /* ! VFS_LKM */ /* * VFS Operations. @@ -190,13 +187,11 @@ cd9660_mount(mp, path, data, ndp, p) mode_t accessmode; struct iso_mnt *imp = 0; -#ifndef VFS_LKM /* mount root makes no sense to an LKM */ if ((mp->mnt_flag & MNT_ROOTFS) != 0) { if (bdevsw[major(rootdev)]->d_flags & D_NOCLUSTERR) mp->mnt_flag |= MNT_NOCLUSTERR; return (iso_mountroot(mp, p)); } -#endif /* ! VFS_LKM */ if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args)))) return (error); diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 18ff3f4..9e661a6 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.45 1998/10/25 19:26:18 bde Exp $ + * $Id: cd9660_vfsops.c,v 1.46 1998/12/06 11:36:24 jkh Exp $ */ #include <sys/param.h> @@ -141,8 +141,6 @@ iso_get_ssector(dev, p) return ntohl(t.entry.addr.lba); } -#ifndef VFS_LKM /* mount root makes no sense to an LKM */ - static int iso_mountroot __P((struct mount *mp, struct proc *p)); static int @@ -168,7 +166,6 @@ iso_mountroot(mp, p) (void)cd9660_statfs(mp, &mp->mnt_stat, p); return (0); } -#endif /* ! VFS_LKM */ /* * VFS Operations. @@ -190,13 +187,11 @@ cd9660_mount(mp, path, data, ndp, p) mode_t accessmode; struct iso_mnt *imp = 0; -#ifndef VFS_LKM /* mount root makes no sense to an LKM */ if ((mp->mnt_flag & MNT_ROOTFS) != 0) { if (bdevsw[major(rootdev)]->d_flags & D_NOCLUSTERR) mp->mnt_flag |= MNT_NOCLUSTERR; return (iso_mountroot(mp, p)); } -#endif /* ! VFS_LKM */ if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args)))) return (error); |
