Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump/fs/lib/libzfs don't perform tasks already done by z...



details:   https://anonhg.NetBSD.org/src/rev/e06d34b0837a
branches:  trunk
changeset: 761227:e06d34b0837a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 21 12:23:29 2011 +0000

description:
don't perform tasks already done by zfs_modcmd

diffstat:

 sys/rump/fs/lib/libzfs/component.c |  27 +++------------------------
 1 files changed, 3 insertions(+), 24 deletions(-)

diffs (51 lines):

diff -r ab6c5724bce7 -r e06d34b0837a sys/rump/fs/lib/libzfs/component.c
--- a/sys/rump/fs/lib/libzfs/component.c        Fri Jan 21 10:43:33 2011 +0000
+++ b/sys/rump/fs/lib/libzfs/component.c        Fri Jan 21 12:23:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: component.c,v 1.1 2011/01/18 22:21:23 haad Exp $ */
+/*     $NetBSD: component.c,v 1.2 2011/01/21 12:23:29 pooka Exp $ */
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2011/01/18 22:21:23 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.2 2011/01/21 12:23:29 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -80,31 +80,10 @@
 #include "rump_dev_private.h"
 #include "rump_vfs_private.h"
 
-RUMP_COMPONENT(RUMP_COMPONENT_KERN_VFS)
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
 {
-       int error;
-
        extern int physmem;
 
-       extern uint_t zfs_fsyncer_key;
-       extern uint_t rrw_tsd_key;
-
-       extern const struct bdevsw zfs_bdevsw;
-       extern const struct cdevsw zfs_cdevsw;
-
-       static int      zfs_bmajor = -1;
-       static int      zfs_cmajor = -1;
-
        /* Set physmem to fit zfs limits. ZFS_MINMEGS * 2048 / PAGE_SIZE */
        physmem = 262144;
-       error = devsw_attach("zfs", &zfs_bdevsw, &zfs_bmajor,
-           &zfs_cdevsw, &zfs_cmajor);
-       if (error != 0) {
-               zvol_fini();
-               zfs_vfsfini();
-               spa_fini();
-               lwp_specific_key_delete(zfs_fsyncer_key);
-               lwp_specific_key_delete(rrw_tsd_key);
-       }
-       return;
 }



Home | Main Index | Thread Index | Old Index