make it possible to build & load puffs as an LKM
by Lubomir Kundrak, PR kern/35000
This commit is contained in:
pooka
parent
993da55808
commit
f212146148
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: puffs_sys.h,v 1.3 2006/10/27 12:25:16 pooka Exp $ */
|
||||
/* $NetBSD: puffs_sys.h,v 1.4 2006/11/06 11:44:54 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
#include <sys/lock.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/pool.h>
|
||||
|
||||
#include <fs/puffs/puffs_msgif.h>
|
||||
|
||||
|
|
@ -52,6 +53,8 @@ extern const struct vnodeopv_desc puffs_vnodeop_opv_desc;
|
|||
extern const struct vnodeopv_desc puffs_specop_opv_desc;
|
||||
extern const struct vnodeopv_desc puffs_fifoop_opv_desc;
|
||||
|
||||
extern struct pool puffs_pnpool;
|
||||
|
||||
/*
|
||||
* While a request is going to userspace, park the caller within the
|
||||
* kernel. This is the kernel counterpart of "struct puffs_req".
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: puffs_vfsops.c,v 1.4 2006/10/27 12:25:16 pooka Exp $ */
|
||||
/* $NetBSD: puffs_vfsops.c,v 1.5 2006/11/06 11:44:54 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.4 2006/10/27 12:25:16 pooka Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.5 2006/11/06 11:44:54 pooka Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
|
|
@ -405,6 +405,12 @@ void
|
|||
puffs_init()
|
||||
{
|
||||
|
||||
#ifdef _LKM
|
||||
malloc_type_attach(M_PUFFS);
|
||||
pool_init(&puffs_pnpool, sizeof(struct puffs_node), 0, 0, 0,
|
||||
"puffspnpl", &pool_allocator_nointr);
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -412,6 +418,11 @@ void
|
|||
puffs_done()
|
||||
{
|
||||
|
||||
#ifdef _LKM
|
||||
pool_destroy(&puffs_pnpool);
|
||||
malloc_type_detach(M_PUFFS);
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
# $NetBSD: Makefile,v 1.1 2006/11/06 11:44:55 pooka Exp $
|
||||
|
||||
.include "../Makefile.inc"
|
||||
|
||||
.PATH: $S/fs/puffs ${.CURDIR}/..
|
||||
|
||||
KMOD= puffs
|
||||
|
||||
SRCS= lkminit_vfs.c
|
||||
SRCS+= puffs_msgif.c puffs_subr.c puffs_vfsops.c puffs_vnops.c
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
/* $NetBSD: lkminit_vfs.c,v 1.1 2006/11/06 11:44:55 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Michael Graff <explorer@flame.org>.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Lubomir Kundrak <lkundrak@skosi.org>.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: lkminit_vfs.c,v 1.1 2006/11/06 11:44:55 pooka Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/lkm.h>
|
||||
|
||||
static int puffs_dispatch_vfs __P((struct lkm_table *, int, int));
|
||||
static int puffs_dispatch_dev __P((struct lkm_table *, int, int));
|
||||
int puffs_lkmentry __P((struct lkm_table *, int, int));
|
||||
|
||||
/*
|
||||
* The VFS part of module.
|
||||
*/
|
||||
static int
|
||||
puffs_dispatch_vfs(struct lkm_table *lkmtp, int cmd, int ver)
|
||||
{
|
||||
extern struct vfsops puffs_vfsops;
|
||||
|
||||
/*
|
||||
* declare the filesystem
|
||||
*/
|
||||
MOD_VFS("puffs", -1, &puffs_vfsops);
|
||||
lkmtp->private.lkm_any = (void *) &_module; /* XXX */
|
||||
|
||||
DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc);
|
||||
}
|
||||
|
||||
/*
|
||||
* The device part.
|
||||
*/
|
||||
static int
|
||||
puffs_dispatch_dev(struct lkm_table *lkmtp, int cmd, int ver)
|
||||
{
|
||||
/*
|
||||
* declare up/down call device
|
||||
*/
|
||||
extern const struct cdevsw puffs_cdevsw;
|
||||
|
||||
MOD_DEV("puffs", "puffs", NULL, -1, &puffs_cdevsw, -1);
|
||||
lkmtp->private.lkm_any = (void *) &_module; /* XXX */
|
||||
|
||||
DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc);
|
||||
}
|
||||
|
||||
/*
|
||||
* entry point
|
||||
*/
|
||||
int
|
||||
puffs_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
|
||||
{
|
||||
int error = 0;
|
||||
|
||||
switch (cmd) {
|
||||
case LKM_E_UNLOAD:
|
||||
case LKM_E_LOAD:
|
||||
error = puffs_dispatch_dev(lkmtp, cmd, ver);
|
||||
if (error)
|
||||
break;
|
||||
error = puffs_dispatch_vfs(lkmtp, cmd, ver);
|
||||
break;
|
||||
case LKM_E_STAT:
|
||||
error = lkmdispatch(lkmtp, cmd);
|
||||
break;
|
||||
}
|
||||
return error;
|
||||
}
|
||||
Loading…
Reference in New Issue