svn commit: r220571 - stable/7/sys/fs/devfs

[Jaakko Heinonen]

Author: jh
Date: Tue Apr 12 16:52:05 2011
New Revision: 220571
URL: http://svn.freebsd.org/changeset/base/220571

Log:
  MFC r216391:
  
  Handle the special ruleset 0 in devfs_ruleset_use(). An attempt set the
  current ruleset to 0 with command "devfs ruleset 0" triggered a KASSERT
  in devfs_ruleset_create().
  
  PR:		kern/125030

Modified:
  stable/7/sys/fs/devfs/devfs_rule.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/fs/devfs/devfs_rule.c
==============================================================================
--- stable/7/sys/fs/devfs/devfs_rule.c	Tue Apr 12 16:43:29 2011	(r220570)
+++ stable/7/sys/fs/devfs/devfs_rule.c	Tue Apr 12 16:52:05 2011	(r220571)
@@ -741,6 +741,11 @@ devfs_ruleset_use(devfs_rsnum rsnum, str
 		devfs_ruleset_reap(cds);
 	}
 
+	if (rsnum == 0) {
+		dm->dm_ruleset = 0;
+		return (0);
+	}
+
 	ds = devfs_ruleset_bynum(rsnum);
 	if (ds == NULL)
 		ds = devfs_ruleset_create(rsnum);