From a13234bb35c2671d47ec5b12eb613bb5d62121f2 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 25 Apr 2001 07:07:52 +0000 Subject: 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 from --- sys/gnu/fs/ext2fs/ext2_mount.h | 2 -- sys/gnu/fs/ext2fs/ext2_vfsops.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'sys/gnu/fs') diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h index 900c81e61307..f5b93f57caa1 100644 --- a/sys/gnu/fs/ext2fs/ext2_mount.h +++ b/sys/gnu/fs/ext2fs/ext2_mount.h @@ -68,7 +68,6 @@ struct timeval; struct ucred; struct uio; struct vnode; -struct netexport; struct ufs_extattr_per_mount; /* This structure describes the UFS specific mount structure data. */ @@ -94,7 +93,6 @@ struct ufsmount { time_t um_btime[MAXQUOTAS]; /* block quota time limit */ time_t um_itime[MAXQUOTAS]; /* inode quota time limit */ char um_qflags[MAXQUOTAS]; /* quota specific flags */ - struct netexport um_export; /* export information */ int64_t um_savedmaxfilesize; /* XXX - limit maxfilesize */ struct malloc_type *um_malloctype; /* The inodes malloctype */ int um_i_effnlink_valid; /* i_effnlink valid? */ diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 263db6dcf090..5f7118eb85c0 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -96,7 +96,7 @@ static struct vfsops ext2fs_vfsops = { ext2_sync, ext2_vget, ext2_fhtovp, - ufs_check_export, + vfs_stdcheckexp, ext2_vptofh, ext2_init, vfs_stduninit, @@ -264,7 +264,7 @@ ext2_mount(mp, path, data, ndp, p) /* * Process export requests. */ - return (vfs_export(mp, &ump->um_export, &args.export)); + return (vfs_export(mp, &args.export)); } } /* -- cgit v1.3