upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the standard DISKFLAG_OPEN instead of implementing our own.

Browse source 
Use noclose() instead now that our close method is empty.
This commit is contained in:
Poul-Henning Kamp 2003-02-22 10:10:12 +00:00
parent 3512c1b386
commit 3eb309c55e
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/dev/amr/amr_disk.c
View file

@ -85,14 +85,13 @@ static int amrd_attach(device_t dev);
static int amrd_detach(device_t dev);
static d_open_t amrd_open;
static d_close_t amrd_close;
static d_strategy_t amrd_strategy;
#define AMRD_CDEV_MAJOR 133
static struct cdevsw amrd_cdevsw = {
/* open */ amrd_open,
/* close */ amrd_close,
/* close */ noclose,
/* read */ physread,
/* write */ physwrite,
/* ioctl */ noioctl,
@ -164,20 +163,6 @@ amrd_open(dev_t dev, int flags, int fmt, d_thread_t *td)
sc->amrd_disk.d_fwheads = sc->amrd_drive->al_heads;
#endif
sc->amrd_flags |= AMRD_OPEN;
return (0);
}
static int
amrd_close(dev_t dev, int flags, int fmt, d_thread_t *td)
{
struct amrd_softc *sc = (struct amrd_softc *)dev->si_drv1;
debug_called(1);
if (sc == NULL)
return (ENXIO);
sc->amrd_flags &= ~AMRD_OPEN;
return (0);
}
@ -284,7 +269,7 @@ amrd_detach(device_t dev)
debug_called(1);
if (sc->amrd_flags & AMRD_OPEN)
if (sc->amrd_disk.d_flags & DISKFLAG_OPEN)
return(EBUSY);
devstat_remove_entry(&sc->amrd_stats);

2
sys/dev/amr/amrvar.h
View file

@ -256,8 +256,6 @@ struct amrd_softc
struct disk amrd_disk;
struct devstat amrd_stats;
int amrd_unit;
int amrd_flags;
#define AMRD_OPEN (1<<0) /* drive is open (can't detach) */
};
/*