From f5af7353c0a91fe2e14e72b9193b2c10ae96c043 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Tue, 8 Mar 2005 19:51:27 +0000 Subject: [PATCH] Remove kernelside support for devfs rules filtering on major numbers. --- sys/fs/devfs/devfs.h | 2 -- sys/fs/devfs/devfs_rule.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h index 5a484c96c074..c8f107419ed3 100644 --- a/sys/fs/devfs/devfs.h +++ b/sys/fs/devfs/devfs.h @@ -78,11 +78,9 @@ struct devfs_rule { int dr_icond; #define DRC_DSWFLAGS 0x001 #define DRC_PATHPTRN 0x002 -#define DRC_MAJOR 0x004 int dr_dswflags; /* cdevsw flags to match. */ #define DEVFS_MAXPTRNLEN 200 char dr_pathptrn[DEVFS_MAXPTRNLEN]; /* Pattern to match path. */ - int dr_major; /* Device major number. */ /* * Things to change. dr_iacts determines which of the other diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 52dc013f10a5..5168efe6cc31 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -614,9 +614,6 @@ devfs_rule_match(struct devfs_krule *dk, struct devfs_dirent *de) if (dr->dr_icond & DRC_PATHPTRN) if (!devfs_rule_matchpath(dk, de)) goto nomatch; - if (dr->dr_icond & DRC_MAJOR) - if (dev == NULL || major(dev) != dr->dr_major) - goto nomatch; return (1);