diff options
author | bde <bde@FreeBSD.org> | 2002-09-10 13:48:21 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2002-09-10 13:48:21 +0000 |
commit | 0cf07ebe50d925cb964b61f9d401ebc3f6cfba4e (patch) | |
tree | e933a15ccbcad77bbc0b09c9d002b46f00f4dbf4 | |
parent | 0dedf1f92a15bd3d3ad5c3f6f64425a576e29eb5 (diff) | |
download | FreeBSD-src-0cf07ebe50d925cb964b61f9d401ebc3f6cfba4e.zip FreeBSD-src-0cf07ebe50d925cb964b61f9d401ebc3f6cfba4e.tar.gz |
Fixed namespace pollution in uma changes:
- use `struct uma_zone *' instead of uma_zone_t, so that <sys/uma.h> isn't
a prerequisite.
- don't include <sys/uma.h>.
Namespace pollution makes "opaque" types like uma_zone_t perfectly
non-opaque. Such types should never be used (see style(9)).
"Fixed" subsequently grown dependencies of this header on its own
pollution by polluting explicitly:
- include <sys/mutex.h> and its prerequisite <sys/lock.h> instead of
depending on namespace pollution 2 layers deep in <sys/uma.h>.
-rw-r--r-- | sys/sys/vnode.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index abfb342..b16ce9d 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -46,11 +46,12 @@ #include <sys/queue.h> #include <sys/_label.h> #include <sys/_lock.h> +#include <sys/lock.h> #include <sys/_mutex.h> +#include <sys/mutex.h> #include <sys/selinfo.h> #include <sys/uio.h> #include <sys/acl.h> -#include <vm/uma.h> /* * The vnode is the focus of all file activity in UNIX. There is a @@ -361,7 +362,7 @@ extern int vttoif_tab[]; */ extern struct vnode *rootvnode; /* root (i.e. "/") vnode */ extern int desiredvnodes; /* number of vnodes desired */ -extern uma_zone_t namei_zone; +extern struct uma_zone *namei_zone; extern int prtactive; /* nonzero to call vprint() */ extern struct vattr va_null; /* predefined null vattr structure */ extern int vfs_ioopt; |