[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Don't allow modul...

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

details:   https://anonhg.NetBSD.org/src/rev/c05f73f7e367
branches:  trunk
changeset: 761229:c05f73f7e367
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 21 13:08:42 2011 +0000

description:
Don't allow module to init if root is not mounted since the modcmd
wants to traverse the file system.  This *might* fix statically
linking zfs support into the kernel (at least it fixes rump kernel
bootstrap).

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 3155e104a031 -r c05f73f7e367 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Fri Jan 21 12:24:24 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Fri Jan 21 13:08:42 2011 +0000
@@ -4601,6 +4601,9 @@
        
        switch (cmd) {
        case MODULE_CMD_INIT:
+               if (!rootvnode)
+                       return EAGAIN;
+
                printf("WARNING: ZFS on NetBSD is under development\n");
                availrmem = (uint64_t)physmem * PAGE_SIZE / 1048576;
                if (availrmem < ZFS_MIN_MEGS * 80 / 100) {