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

Revert r206560. The change doesn't work correctly in all cases with

Browse Source 
multiple devfs mounts.
This commit is contained in:
jh 2010-04-16 07:02:28 +00:00
parent 1181490d6c
commit 0cfb62fa2a
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/fs/devfs/devfs_devs.c
View File

@ -408,9 +408,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup)
continue;
KASSERT((cdp->cdp_flags & CDP_ACTIVE), ("Bogons, I tell ya'!"));
if (cdp->cdp_flags & CDP_INVALID)
continue;
if (dm->dm_idx <= cdp->cdp_maxdirent &&
cdp->cdp_dirents[dm->dm_idx] != NULL) {
de = cdp->cdp_dirents[dm->dm_idx];
@ -428,8 +425,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup)
dd = dm->dm_rootdir;
s = cdp->cdp_c.si_name;
for (;;) {
while (*s == '/')
s++;
for (q = s; *q != '/' && *q != '\0'; q++)
continue;
if (*q != '/')
@ -439,24 +434,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup)
de = devfs_vmkdir(dm, s, q - s, dd, 0);
s = q + 1;
dd = de;
if (dd->de_flags & (DE_DOT | DE_DOTDOT))
break;
}
/*
* XXX: Ignore duplicate and empty device names.
* XXX: Currently there is no way to report the error to
* XXX: the make_dev(9) caller.
*/
if (dd->de_dirent->d_type != DT_DIR ||
dd->de_flags & (DE_DOT | DE_DOTDOT) || q - s < 1 ||
devfs_find(dd, s, q - s) != NULL) {
dev_lock();
cdp->cdp_flags |= CDP_INVALID;
dev_unlock();
printf("%s: %s: invalid or duplicate device name\n",
__func__, cdp->cdp_c.si_name);
return (1);
}
de = devfs_newdirent(s, q - s);

1
sys/fs/devfs/devfs_int.h
View File

@ -55,7 +55,6 @@ struct cdev_priv {
u_int cdp_flags;
#define CDP_ACTIVE (1 << 0)
#define CDP_SCHED_DTR (1 << 1)
#define CDP_INVALID (1 << 2)
u_int cdp_inuse;
u_int cdp_maxdirent;