diff options
| author | phk <phk@FreeBSD.org> | 2001-04-25 07:07:52 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2001-04-25 07:07:52 +0000 |
| commit | cdc83afc7f1e444c4646840f48592b7ff524fbea (patch) | |
| tree | 1d205c2b7e9b1a72323178bdb64ac082cbe816a5 /sys/fs/hpfs/hpfs_vfsops.c | |
| parent | 3a77c500a93ed027c8d6959da8f6ecc3c7752441 (diff) | |
| download | FreeBSD-src-cdc83afc7f1e444c4646840f48592b7ff524fbea.zip FreeBSD-src-cdc83afc7f1e444c4646840f48592b7ff524fbea.tar.gz | |
Move the netexport structure from the fs-specific mountstructure
to struct mount.
This makes the "struct netexport *" paramter to the vfs_export
and vfs_checkexport interface unneeded.
Consequently that all non-stacking filesystems can use
vfs_stdcheckexp().
At the same time, make it a pointer to a struct netexport
in struct mount, so that we can remove the bogus AF_MAX
and #include <net/radix.h> from <sys/mount.h>
Diffstat (limited to 'sys/fs/hpfs/hpfs_vfsops.c')
| -rw-r--r-- | sys/fs/hpfs/hpfs_vfsops.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c index 2d40b2d..ec68f86 100644 --- a/sys/fs/hpfs/hpfs_vfsops.c +++ b/sys/fs/hpfs/hpfs_vfsops.c @@ -88,8 +88,6 @@ static int hpfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *)); static int hpfs_init __P((struct vfsconf *)); static int hpfs_uninit __P((struct vfsconf *)); -static int hpfs_checkexp __P((struct mount *, struct sockaddr *, - int *, struct ucred **)); #else /* defined(__NetBSD__) */ static int hpfs_mount __P((struct mount *, const char *, void *, struct nameidata *, struct proc *)); @@ -101,20 +99,14 @@ static int hpfs_checkexp __P((struct mount *, struct mbuf *, int *, struct ucred **)); #endif +#if !defined(__FreeBSD__) /*ARGSUSED*/ static int hpfs_checkexp(mp, nam, exflagsp, credanonp) -#if defined(__FreeBSD__) - register struct mount *mp; - struct sockaddr *nam; - int *exflagsp; - struct ucred **credanonp; -#else /* defined(__NetBSD__) */ register struct mount *mp; struct mbuf *nam; int *exflagsp; struct ucred **credanonp; -#endif { register struct netcred *np; register struct hpfsmount *hpm = VFSTOHPFS(mp); @@ -130,6 +122,7 @@ hpfs_checkexp(mp, nam, exflagsp, credanonp) *credanonp = &np->netc_anon; return (0); } +#endif #if !defined(__FreeBSD__) /*ARGSUSED*/ @@ -222,7 +215,11 @@ hpfs_mount ( if (args.fspec == 0) { dprintf(("export 0x%x\n",args.export.ex_flags)); +#if defined(__FreeBSD__) + err = vfs_export(mp, &args.export); +#else /* defined(__NetBSD__) */ err = vfs_export(mp, &hpmp->hpm_export, &args.export); +#endif if (err) { printf("hpfs_mount: vfs_export failed %d\n", err); @@ -741,7 +738,7 @@ static struct vfsops hpfs_vfsops = { vfs_stdsync, hpfs_vget, hpfs_fhtovp, - hpfs_checkexp, + vfs_stdcheckexp, hpfs_vptofh, hpfs_init, hpfs_uninit, |
