[src/trunk]: src/sys/ufs/ufs use #if defined(_KERNEL_OPT) around opt includes

[dbj <dbj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0e110a20fe0
branches:  trunk
changeset: 572115:b0e110a20fe0
user:      dbj <dbj%NetBSD.org@localhost>
date:      Mon Dec 20 03:12:20 2004 +0000

description:
use #if defined(_KERNEL_OPT) around opt includes
fix arg to pool_init() when _LKM is defined

diffstat:

 sys/ufs/ufs/ufs_inode.c  |  6 ++++--
 sys/ufs/ufs/ufs_vfsops.c |  8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r d1c7695c39ce -r b0e110a20fe0 sys/ufs/ufs/ufs_inode.c
--- a/sys/ufs/ufs/ufs_inode.c   Mon Dec 20 01:28:24 2004 +0000
+++ b/sys/ufs/ufs/ufs_inode.c   Mon Dec 20 03:12:20 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_inode.c,v 1.45 2004/10/08 18:43:50 dbj Exp $       */
+/*     $NetBSD: ufs_inode.c,v 1.46 2004/12/20 03:12:20 dbj Exp $       */
 
 /*
  * Copyright (c) 1991, 1993
@@ -37,9 +37,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.45 2004/10/08 18:43:50 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.46 2004/12/20 03:12:20 dbj Exp $");
 
+#if defined(_KERNEL_OPT)
 #include "opt_quota.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d1c7695c39ce -r b0e110a20fe0 sys/ufs/ufs/ufs_vfsops.c
--- a/sys/ufs/ufs/ufs_vfsops.c  Mon Dec 20 01:28:24 2004 +0000
+++ b/sys/ufs/ufs/ufs_vfsops.c  Mon Dec 20 03:12:20 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_vfsops.c,v 1.20 2004/06/20 18:25:54 hannken Exp $  */
+/*     $NetBSD: ufs_vfsops.c,v 1.21 2004/12/20 03:12:20 dbj Exp $      */
 
 /*
  * Copyright (c) 1991, 1993, 1994
@@ -37,9 +37,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.20 2004/06/20 18:25:54 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.21 2004/12/20 03:12:20 dbj Exp $");
 
+#if defined(_KERNEL_OPT)
 #include "opt_quota.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -231,7 +233,7 @@
                return;
 
 #ifdef _LKM
-       pool_init(ufs_direct_pool, sizeof(struct direct), 0, 0, 0, "ufsdirpl",
+       pool_init(&ufs_direct_pool, sizeof(struct direct), 0, 0, 0, "ufsdirpl",
            &pool_allocator_nointr);
 #endif