Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back this out. Fails lockdebug with duplicate lock initialization. 

Please test with LOCKDEBUG!
This commit is contained in:
christos 2010-12-11 04:21:17 +00:00
parent cedd9a0b1c
commit a39b3d540d
2 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/netsmb/smb_dev.c
View File

@ -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>
@ -67,10 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.34 2010/12/10 19:44:18 ahoka Exp $");
#include <netsmb/smb_dev.h>
#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)])
@ -466,42 +462,6 @@ nsmb_dev_load(module_t mod, int cmd, void *arg)
}
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__ */
/*

6
sys/netsmb/smb_iod.c
View File

@ -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 @@ smb_iod_init(void)
return 0;
}
#ifndef __NetBSD__
int
smb_iod_done(void)
{
return 0;
}
#endif