[src/trunk]: src/sys/netsmb Back this out. Fails lockdebug with duplicate loc...

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

details:   https://anonhg.NetBSD.org/src/rev/f3543abb926d
branches:  trunk
changeset: 759471:f3543abb926d
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 11 04:21:17 2010 +0000

description:
Back this out. Fails lockdebug with duplicate lock initialization.
Please test with LOCKDEBUG!

diffstat:

 sys/netsmb/smb_dev.c |  44 ++------------------------------------------
 sys/netsmb/smb_iod.c |   6 ++++--
 2 files changed, 6 insertions(+), 44 deletions(-)

diffs (101 lines):

diff -r 292360b7c9dd -r f3543abb926d sys/netsmb/smb_dev.c
--- a/sys/netsmb/smb_dev.c      Sat Dec 11 04:13:03 2010 +0000
+++ b/sys/netsmb/smb_dev.c      Sat Dec 11 04:21:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb_dev.c,v 1.34 2010/12/10 19:44:18 ahoka Exp $       */
+/*     $NetBSD: smb_dev.c,v 1.35 2010/12/11 04:21:17 christos Exp $    */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.34 2010/12/10 19:44:18 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.35 2010/12/11 04:21:17 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -68,10 +68,6 @@
 #include <netsmb/smb_rq.h>
 
 #ifdef __NetBSD__
-#include <sys/module.h>
-#endif
-
-#ifdef __NetBSD__
 static struct smb_dev **smb_devtbl; /* indexed by minor */
 #define SMB_GETDEV(dev) (smb_devtbl[minor(dev)])
 #define NSMB_DEFNUM    4
@@ -466,42 +462,6 @@
 }
 
 DEV_MODULE (dev_netsmb, nsmb_dev_load, 0);
-#else
-MODULE(MODULE_CLASS_MISC, nsmb, NULL);
-
-static int
-nsmb_modcmd(modcmd_t cmd, void *arg)
-{
-       devmajor_t cmajor = NODEVMAJOR, bmajor = NODEVMAJOR;
-       int error = 0;
-
-       switch (cmd) {
-           case MODULE_CMD_INIT:
-               error = smb_sm_init();
-               if (error)
-                       break;
-               error = smb_iod_init();
-               if (error) {
-                       smb_sm_done();
-                       break;
-               }
-               error =
-                   devsw_attach("nsmb", NULL, &bmajor, &nsmb_cdevsw, &cmajor);
-               if (error)
-                       return error;
-
-               break;
-           case MODULE_CMD_FINI:
-               smb_iod_done();
-               smb_sm_done();
-               error = devsw_detach(NULL, &nsmb_cdevsw);
-               break;
-           default:
-               error = ENOTTY;
-               break;
-       }
-       return error;
-}
 #endif /* !__NetBSD__ */
 
 /*
diff -r 292360b7c9dd -r f3543abb926d sys/netsmb/smb_iod.c
--- a/sys/netsmb/smb_iod.c      Sat Dec 11 04:13:03 2010 +0000
+++ b/sys/netsmb/smb_iod.c      Sat Dec 11 04:21:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb_iod.c,v 1.36 2010/12/10 19:44:18 ahoka Exp $       */
+/*     $NetBSD: smb_iod.c,v 1.37 2010/12/11 04:21:17 christos Exp $    */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.36 2010/12/10 19:44:18 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_iod.c,v 1.37 2010/12/11 04:21:17 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -744,8 +744,10 @@
        return 0;
 }
 
+#ifndef __NetBSD__
 int
 smb_iod_done(void)
 {
        return 0;
 }
+#endif