diff options
| author | julian <julian@FreeBSD.org> | 1998-04-20 23:18:46 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 1998-04-20 23:18:46 +0000 |
| commit | 3f128f8b371395d5b326b70580b9356459266636 (patch) | |
| tree | 9d0c95c2b4ddb5c3e15a2be06f085122be7dee54 /sys | |
| parent | f475e872ad522f322a7f3e4819186d6583438904 (diff) | |
| download | FreeBSD-src-3f128f8b371395d5b326b70580b9356459266636.zip FreeBSD-src-3f128f8b371395d5b326b70580b9356459266636.tar.gz | |
The 'mountroot' option is obviously pointless for an LKM
so allow LKM compilation to succeed by making it go away for that case.
Saves needing to include opt_devfs.h which an LKM cannot rely on anyhow.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 12 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 09f2712..eab93af 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -36,10 +36,9 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.36 1998/04/19 23:31:48 julian Exp $ + * $Id: cd9660_vfsops.c,v 1.37 1998/04/20 03:57:27 julian Exp $ */ -#include "opt_devfs.h" /* for SLICE */ #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> @@ -103,7 +102,6 @@ VFS_SET(cd9660_vfsops, cd9660, MOUNT_CD9660, VFCF_READONLY); static int iso_get_ssector __P((dev_t dev, struct proc *p)); static int iso_mountfs __P((struct vnode *devvp, struct mount *mp, struct proc *p, struct iso_args *argp)); -static int iso_mountroot __P((struct mount *mp, struct proc *p)); /* * Try to find the start of the last data track on this CD-ROM. This @@ -144,9 +142,14 @@ iso_get_ssector(dev, p) return ntohl(t.entry.addr.lba); } + +#ifndef VFS_LKM /* mount root makes no sense to an LKM */ + +#include "opt_devfs.h" /* for SLICE */ #ifdef SLICE extern struct vnode *root_device_vnode; #endif +static int iso_mountroot __P((struct mount *mp, struct proc *p)); static int iso_mountroot(mp, p) @@ -179,6 +182,7 @@ iso_mountroot(mp, p) (void)cd9660_statfs(mp, &mp->mnt_stat, p); return (0); } +#endif /* ! VFS_LKM */ /* * VFS Operations. @@ -199,11 +203,13 @@ cd9660_mount(mp, path, data, ndp, p) int error; 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 09f2712..eab93af 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -36,10 +36,9 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.36 1998/04/19 23:31:48 julian Exp $ + * $Id: cd9660_vfsops.c,v 1.37 1998/04/20 03:57:27 julian Exp $ */ -#include "opt_devfs.h" /* for SLICE */ #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> @@ -103,7 +102,6 @@ VFS_SET(cd9660_vfsops, cd9660, MOUNT_CD9660, VFCF_READONLY); static int iso_get_ssector __P((dev_t dev, struct proc *p)); static int iso_mountfs __P((struct vnode *devvp, struct mount *mp, struct proc *p, struct iso_args *argp)); -static int iso_mountroot __P((struct mount *mp, struct proc *p)); /* * Try to find the start of the last data track on this CD-ROM. This @@ -144,9 +142,14 @@ iso_get_ssector(dev, p) return ntohl(t.entry.addr.lba); } + +#ifndef VFS_LKM /* mount root makes no sense to an LKM */ + +#include "opt_devfs.h" /* for SLICE */ #ifdef SLICE extern struct vnode *root_device_vnode; #endif +static int iso_mountroot __P((struct mount *mp, struct proc *p)); static int iso_mountroot(mp, p) @@ -179,6 +182,7 @@ iso_mountroot(mp, p) (void)cd9660_statfs(mp, &mp->mnt_stat, p); return (0); } +#endif /* ! VFS_LKM */ /* * VFS Operations. @@ -199,11 +203,13 @@ cd9660_mount(mp, path, data, ndp, p) int error; 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); |
