Remove bogus use of splhigh(), and apparently unneeded bzero().

This commit is contained in:
mycroft 1997-03-12 22:31:37 +00:00
parent 2330e40bc9
commit 8f8b0d91e5
2 changed files with 4 additions and 12 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ccd.c,v 1.38 1997/01/30 04:00:52 thorpej Exp $ */
/* $NetBSD: ccd.c,v 1.39 1997/03/12 22:31:37 mycroft Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -1060,7 +1060,7 @@ ccdioctl(dev, cmd, data, flag, p)
{
int unit = ccdunit(dev);
int i, j, lookedup = 0, error = 0;
int part, pmask, s;
int part, pmask;
struct ccd_softc *cs;
struct ccd_ioctl *ccio = (struct ccd_ioctl *)data;
struct ccddevice ccd;
@ -1241,11 +1241,7 @@ ccdioctl(dev, cmd, data, flag, p)
/* Detatch the disk. */
disk_detach(&cs->sc_dkdev);
/* This must be atomic. */
s = splhigh();
ccdunlock(cs);
bzero(cs, sizeof(struct ccd_softc));
splx(s);
break;

View File

@ -1,4 +1,4 @@
/* $NetBSD: vnd.c,v 1.31 1997/01/31 05:18:51 thorpej Exp $ */
/* $NetBSD: vnd.c,v 1.32 1997/03/12 22:31:40 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -510,7 +510,7 @@ vndioctl(dev, cmd, data, flag, p)
struct vnd_ioctl *vio;
struct vattr vattr;
struct nameidata nd;
int error, part, pmask, s;
int error, part, pmask;
#ifdef DEBUG
if (vnddebug & VDB_FOLLOW)
@ -609,11 +609,7 @@ vndioctl(dev, cmd, data, flag, p)
/* Detatch the disk. */
disk_detach(&vnd->sc_dkdev);
/* This must be atomic. */
s = splhigh();
vndunlock(vnd);
bzero(vnd, sizeof(struct vnd_softc));
splx(s);
break;