Module Name: src Committed By: christos Date: Sun Mar 10 04:24:16 UTC 2013
Modified Files: src/sys/rump/fs/lib/libzfs: component.c Log Message: Now that the auto-loading zfs bug has been fixed, the loading failed because the devsw node was busied here. Since we load the devsw only for the purpose of creating the device node in our virtual filesystem, detach it after we are done so that the real module can reload it. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/fs/lib/libzfs/component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/rump/fs/lib/libzfs/component.c diff -u src/sys/rump/fs/lib/libzfs/component.c:1.5 src/sys/rump/fs/lib/libzfs/component.c:1.6 --- src/sys/rump/fs/lib/libzfs/component.c:1.5 Thu Mar 10 17:11:05 2011 +++ src/sys/rump/fs/lib/libzfs/component.c Sat Mar 9 23:24:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $ */ +/* $NetBSD: component.c,v 1.6 2013/03/10 04:24:16 christos Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.6 2013/03/10 04:24:16 christos Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -53,4 +53,5 @@ RUMP_COMPONENT(RUMP_COMPONENT_VFS) if ((error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/zfs", cmaj, 0)) != 0) panic("cannot create zfs dev nodes: %d", error); + devsw_detach(&zfs_bdevsw, &zfs_cdevsw); }