diff options
| author |   tedu <tedu@openbsd.org> | 2013-06-09 12:51:40 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2013-06-09 12:51:40 +0000 |
| commit | 1f3b60e1fc77e4799605c22ed4ca3fdc374c8989 (patch) | |
| tree | 96c884438dbcec3daf8c1f2b2f15fdb1d37e7543 | |
| parent | change a bcopy to memmove (mainly to catch platforms that don't offer it) (diff) | |
| download | wireguard-openbsd-1f3b60e1fc77e4799605c22ed4ca3fdc374c8989.tar.xz wireguard-openbsd-1f3b60e1fc77e4799605c22ed4ca3fdc374c8989.zip | |
move fuse sysctl defines up and add _KERNEL. from Sylvestre Gallon
| -rw-r--r-- | sys/miscfs/fuse/fuse_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fusefs.h | 35 |
2 files changed, 21 insertions, 18 deletions
diff --git a/sys/miscfs/fuse/fuse_vfsops.c b/sys/miscfs/fuse/fuse_vfsops.c index 26169bc5ac4..3a8c24d300c 100644 --- a/sys/miscfs/fuse/fuse_vfsops.c +++ b/sys/miscfs/fuse/fuse_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vfsops.c,v 1.2 2013/06/04 20:52:54 tedu Exp $ */ +/* $OpenBSD: fuse_vfsops.c,v 1.3 2013/06/09 12:51:40 tedu Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -301,7 +301,7 @@ int fusefs_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, return (ENOTDIR); /* overloaded */ switch (name[0]) { - case FUSEFS_NB_OPENDEVS: + case FUSEFS_OPENDEVS: return (sysctl_rdint(oldp, oldlenp, newp, stat_opened_fusedev)); case FUSEFS_INFBUFS: diff --git a/sys/miscfs/fuse/fusefs.h b/sys/miscfs/fuse/fusefs.h index f8a9d0aee67..3c9e0fc88ed 100644 --- a/sys/miscfs/fuse/fusefs.h +++ b/sys/miscfs/fuse/fusefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fusefs.h,v 1.1 2013/06/03 15:50:56 tedu Exp $ */ +/* $OpenBSD: fusefs.h,v 1.2 2013/06/09 12:51:40 tedu Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -18,6 +18,23 @@ #ifndef __FUSEFS_H__ #define __FUSEFS_H__ +/* sysctl defines */ +#define FUSEFS_OPENDEVS 1 /* # of fuse devices opened */ +#define FUSEFS_INFBUFS 2 /* # of in fbufs */ +#define FUSEFS_WAITFBUFS 3 /* # of fbufs waiting for a response */ +#define FUSEFS_POOL_NBPAGES 4 /* # total fusefs size */ +#define FUSEFS_MAXID 5 /* number of valid fusefs ids */ + +#define FUSEFS_NAMES { \ + { 0, 0}, \ + { "fusefs_open_devices", CTLTYPE_INT }, \ + { "fusefs_fbufs_in", CTLTYPE_INT }, \ + { "fusefs_fbufs_wait", CTLTYPE_INT }, \ + { "fusefs_pool_pages", CTLTYPE_INT }, \ +} + +#ifdef _KERNEL + struct fuse_msg; struct fusefs_mnt { @@ -42,21 +59,6 @@ struct fusefs_mnt { extern struct vops fusefs_vops; extern struct pool fusefs_fbuf_pool; -/* sysctl defines */ -#define FUSEFS_NB_OPENDEVS 1 /* # of fuse devices opened */ -#define FUSEFS_INFBUFS 2 /* # of in fbufs */ -#define FUSEFS_WAITFBUFS 3 /* # of fbufs waiting for a response */ -#define FUSEFS_POOL_NBPAGES 4 /* # total fusefs size */ -#define FUSEFS_MAXID 5 /* number of valid fusefs ids */ - -#define FUSEFS_NAMES { \ - { 0, 0}, \ - { "fusefs_open_devices", CTLTYPE_INT }, \ - { "fusefs_fbufs_in", CTLTYPE_INT }, \ - { "fusefs_fbufs_wait", CTLTYPE_INT }, \ - { "fusefs_pool_pages", CTLTYPE_INT }, \ -} - /* fuse helpers */ #define TSLEEP_TIMEOUT 5 void update_vattr(struct mount *mp, struct vattr *v); @@ -82,4 +84,5 @@ void fuse_device_set_fmp(struct fusefs_mnt *); /* #define FUSE_DEBUG_VNOP #define FUSE_DEBUG */ +#endif /* _KERNEL */ #endif /* __FUSEFS_H__ */ |