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

Implement device cloning for /dev/nsmb, the netsmb control pseudo-device.

Browse Source 
The smb library in userspace already knows how to deal with this type of
cloning.

This also corrects a leak in which the netsmb kernel module could not be
unloaded if device nodes had been stat'd but not open'd.

Discussed with:	kib
This commit is contained in:
Robert Watson 2008-11-03 14:23:15 +00:00
parent 45e6ab7f81
commit 339f72c730
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/netsmb/smb_dev.c
View File

@ -89,28 +89,38 @@ int smb_dev_queue(struct smb_dev *ndp, struct smb_rq *rqp, int prio);
static struct cdevsw nsmb_cdevsw = { static struct cdevsw nsmb_cdevsw = {
.d_version = D_VERSION, .d_version = D_VERSION,
.d_flags = D_NEEDGIANT, .d_flags = D_NEEDGIANT | D_NEEDMINOR,
.d_open = nsmb_dev_open, .d_open = nsmb_dev_open,
.d_close = nsmb_dev_close, .d_close = nsmb_dev_close,
.d_ioctl = nsmb_dev_ioctl, .d_ioctl = nsmb_dev_ioctl,
.d_name = NSMB_NAME .d_name = NSMB_NAME
}; };
static eventhandler_tag nsmb_dev_tag; static eventhandler_tag nsmb_dev_tag;
static struct clonedevs *nsmb_clones;
static void static void
nsmb_dev_clone(void *arg, struct ucred *cred, char *name, int namelen, nsmb_dev_clone(void *arg, struct ucred *cred, char *name, int namelen,
struct cdev **dev) struct cdev **dev)
{ {
int u; int i, u;
if (*dev != NULL) if (*dev != NULL)
return; return;
if (dev_stdclone(name, NULL, NSMB_NAME, &u) != 1)
if (strcmp(name, NSMB_NAME) == 0)
u = -1;
else if (dev_stdclone(name, NULL, NSMB_NAME, &u) != 1)
return; return;
*dev = make_dev(&nsmb_cdevsw, u, 0, 0, 0600, i = clone_create(&nsmb_clones, &nsmb_cdevsw, &u, dev, 0);
NSMB_NAME"%d", u); if (i) {
dev_ref(*dev); *dev = make_dev(&nsmb_cdevsw, u, UID_ROOT, GID_WHEEL, 0600,
"%s%d", NSMB_NAME, u);
if (*dev != NULL) {
dev_ref(*dev);
(*dev)->si_flags |= SI_CHEAPCLONE;
}
}
} }
static int static int
@ -340,6 +350,7 @@ nsmb_dev_load(module_t mod, int cmd, void *arg)
smb_sm_done(); smb_sm_done();
break; break;
} }
clone_setup(&nsmb_clones);
nsmb_dev_tag = EVENTHANDLER_REGISTER(dev_clone, nsmb_dev_clone, 0, 1000); nsmb_dev_tag = EVENTHANDLER_REGISTER(dev_clone, nsmb_dev_clone, 0, 1000);
printf("netsmb_dev: loaded\n"); printf("netsmb_dev: loaded\n");
break; break;
@ -350,6 +361,7 @@ nsmb_dev_load(module_t mod, int cmd, void *arg)
break; break;
EVENTHANDLER_DEREGISTER(dev_clone, nsmb_dev_tag); EVENTHANDLER_DEREGISTER(dev_clone, nsmb_dev_tag);
drain_dev_clone_events(); drain_dev_clone_events();
clone_cleanup(&nsmb_clones);
destroy_dev_drain(&nsmb_cdevsw); destroy_dev_drain(&nsmb_cdevsw);
printf("netsmb_dev: unloaded\n"); printf("netsmb_dev: unloaded\n");
break; break;