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

Protect the devfs rule internal global lists with a sx lock, the per

Browse Source 
mount locks are not enough.  Finer granularity (x)locking could be
implemented, but I prefer to keep it simple for now.
This commit is contained in:
Poul-Henning Kamp 2005-09-15 08:50:16 +00:00
parent ab32e95296
commit 6556102dcb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=150150
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/fs/devfs/devfs_rule.c
View File

@ -72,6 +72,7 @@
#include <sys/dirent.h>
#include <sys/vnode.h>
#include <sys/ioccom.h>
#include <sys/sx.h>
#include <fs/devfs/devfs.h>
@ -123,6 +124,7 @@ static void devfs_ruleset_destroy(struct devfs_ruleset **dsp);
static void devfs_ruleset_reap(struct devfs_ruleset **dsp);
static int devfs_ruleset_use(devfs_rsnum rsnum, struct devfs_mount *dm);
static struct sx sx_rules;
static SLIST_HEAD(, devfs_ruleset) devfs_rulesets;
/*
@ -135,9 +137,11 @@ devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de)
{
struct devfs_ruleset *ds;
sx_slock(&sx_rules);
ds = devfs_ruleset_bynum(dm->dm_ruleset);
KASSERT(ds != NULL, ("mount-point has NULL ruleset"));
devfs_ruleset_applyde(ds, de, devfs_rule_depth);
sx_sunlock(&sx_rules);
}
/*
@ -148,6 +152,7 @@ devfs_rules_init(void *junk __unused)
{
struct devfs_ruleset *ds;
sx_init(&sx_rules, "devfsrules");
SLIST_INIT(&devfs_rulesets);
ds = devfs_ruleset_create(0);
@ -179,6 +184,7 @@ devfs_rules_ioctl(struct devfs_mount *dm, u_long cmd, caddr_t data, struct threa
if (error != 0)
return (error);
sx_xlock(&sx_rules);
switch (cmd) {
case DEVFSIO_RADD:
dr = (struct devfs_rule *)data;
@ -310,6 +316,7 @@ devfs_rules_ioctl(struct devfs_mount *dm, u_long cmd, caddr_t data, struct threa
}
out:
sx_xunlock(&sx_rules);
return (error);
}
@ -327,10 +334,12 @@ devfs_rules_newmount(struct devfs_mount *dm, struct thread *td)
* old ruleset. Making some value of ds_ruleset "special" to
* mean "don't decrement refcount" is uglier than this.
*/
sx_slock(&sx_rules);
ds = devfs_ruleset_bynum(0);
KASSERT(ds != NULL, ("no ruleset 0"));
++ds->ds_refcount;
dm->dm_ruleset = 0;
sx_sunlock(&sx_rules);
}
/*
@ -799,4 +808,3 @@ devfs_ruleset_use(devfs_rsnum rsnum, struct devfs_mount *dm)
devfs_ruleset_reap(&cds);
return (0);
}