Backed out previous commit. VFS_LKM_NO_DEFAULT_DISPATCH wasn't used for

long, and the ifdef for it broke the forward declaration for the
dispatch function.
This commit is contained in:
Bruce Evans 1998-09-02 17:03:49 +00:00
parent ac648592d9
commit 53d2eb24a9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=38756

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)mount.h 8.21 (Berkeley) 5/20/95
* $Id: mount.h,v 1.62 1998/05/06 05:29:39 msmith Exp $
* $Id: mount.h,v 1.63 1998/07/25 15:52:10 alex Exp $
*/
#ifndef _SYS_MOUNT_H_
@ -378,18 +378,6 @@ struct vfsops {
#include <sys/sysent.h>
#include <sys/lkm.h>
#ifdef VFS_LKM_NO_DEFAULT_DISPATCH
#define VFS_LKM_DISPATCH(fsname) \
extern int \
fsname ## _mod __P((struct lkm_table *, int, int));
#else
#define VFS_LKM_DISPATCH(fsname) \
int \
fsname ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
MOD_DISPATCH(fsname, \
lkmtp, cmd, ver, lkm_nullcmd, lkm_nullcmd, lkm_nullcmd); }
#endif
#define VFS_SET(vfsops, fsname, index, flags) \
static struct vfsconf _fs_vfsconf = { \
&vfsops, \
@ -400,7 +388,12 @@ struct vfsops {
}; \
extern struct linker_set MODVNOPS; \
MOD_VFS(fsname,&MODVNOPS,&_fs_vfsconf); \
VFS_LKM_DISPATCH(fsname)
extern int \
fsname ## _mod __P((struct lkm_table *, int, int)); \
int \
fsname ## _mod(struct lkm_table *lkmtp, int cmd, int ver) { \
MOD_DISPATCH(fsname, \
lkmtp, cmd, ver, lkm_nullcmd, lkm_nullcmd, lkm_nullcmd); }
#else
#define VFS_SET(vfsops, fsname, index, flags) \