d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep track of all "struct snoop"'s so that snp_modevent can fail with

Browse Source 
EBUSY if there's a device still open.
This commit is contained in:
Dima Dorfman 2001-07-18 13:39:43 +00:00
parent 10b0e058bb
commit ac60b28d35
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/snp/snp.c
View File

@ -23,6 +23,7 @@
#include <sys/conf.h>
#include <sys/poll.h>
#include <sys/kernel.h>
#include <sys/queue.h>
#include <sys/snoop.h>
#include <sys/vnode.h>
@ -64,6 +65,9 @@ static MALLOC_DEFINE(M_SNP, "snp", "Snoop device data");
*/
static int snooplinedisc;
static LIST_HEAD(, snoop) snp_sclist = LIST_HEAD_INITIALIZER(&snp_sclist);
static struct tty *snpdevtotty __P((dev_t dev));
static void snp_clone __P((void *arg, char *name,
int namelen, dev_t *dev));
@ -361,6 +365,8 @@ snpopen(dev, flag, mode, p)
*/
snp->snp_tty = NULL;
snp->snp_target = NODEV;
LIST_INSERT_HEAD(&snp_sclist, snp, snp_list);
return (0);
}
@ -413,6 +419,7 @@ snpclose(dev, flags, fmt, p)
snp = dev->si_drv1;
snp->snp_blen = 0;
LIST_REMOVE(snp, snp_list);
free(snp->snp_buf, M_SNP);
snp->snp_flags &= ~SNOOP_OPEN;
dev->si_drv1 = NULL;
@ -583,7 +590,8 @@ snp_modevent(mod, type, data)
cdevsw_add(&snp_cdevsw);
break;
case MOD_UNLOAD:
/* XXX don't unload if busy. */
if (!LIST_EMPTY(&snp_sclist))
return (EBUSY);
EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
ldisc_deregister(snooplinedisc);
cdevsw_remove(&snp_cdevsw);

10
sys/kern/tty_snoop.c
View File

@ -23,6 +23,7 @@
#include <sys/conf.h>
#include <sys/poll.h>
#include <sys/kernel.h>
#include <sys/queue.h>
#include <sys/snoop.h>
#include <sys/vnode.h>
@ -64,6 +65,9 @@ static MALLOC_DEFINE(M_SNP, "snp", "Snoop device data");
*/
static int snooplinedisc;
static LIST_HEAD(, snoop) snp_sclist = LIST_HEAD_INITIALIZER(&snp_sclist);
static struct tty *snpdevtotty __P((dev_t dev));
static void snp_clone __P((void *arg, char *name,
int namelen, dev_t *dev));
@ -361,6 +365,8 @@ snpopen(dev, flag, mode, p)
*/
snp->snp_tty = NULL;
snp->snp_target = NODEV;
LIST_INSERT_HEAD(&snp_sclist, snp, snp_list);
return (0);
}
@ -413,6 +419,7 @@ snpclose(dev, flags, fmt, p)
snp = dev->si_drv1;
snp->snp_blen = 0;
LIST_REMOVE(snp, snp_list);
free(snp->snp_buf, M_SNP);
snp->snp_flags &= ~SNOOP_OPEN;
dev->si_drv1 = NULL;
@ -583,7 +590,8 @@ snp_modevent(mod, type, data)
cdevsw_add(&snp_cdevsw);
break;
case MOD_UNLOAD:
/* XXX don't unload if busy. */
if (!LIST_EMPTY(&snp_sclist))
return (EBUSY);
EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
ldisc_deregister(snooplinedisc);
cdevsw_remove(&snp_cdevsw);

1
sys/sys/snoop.h
View File

@ -41,6 +41,7 @@
*/
struct snoop {
LIST_ENTRY(snoop) snp_list;
dev_t snp_target; /* major/minor number of device*/
struct tty *snp_tty; /* tty device pointer */
u_long snp_len; /* buffer data length */