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

multiple devfs mounts.

2 files changed, 0 insertions, 24 deletions

diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 79037ba..81b2752 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -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);
diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h
index a998061..5a61dd4 100644
--- a/sys/fs/devfs/devfs_int.h
+++ b/sys/fs/devfs/devfs_int.h
@@ -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;