svn commit: r224904 - stable/8/sys/fs/devfs

[Konstantin Belousov]

Author: kib
Date: Tue Aug 16 08:41:09 2011
New Revision: 224904
URL: http://svn.freebsd.org/changeset/base/224904

Log:
  MFC r224743:
  Do not update mountpoint generation counter to the value which was not
  yet acted upon by devfs_populate().

Modified:
  stable/8/sys/fs/devfs/devfs_devs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/devfs/devfs_devs.c
==============================================================================
--- stable/8/sys/fs/devfs/devfs_devs.c	Tue Aug 16 08:34:16 2011	(r224903)
+++ stable/8/sys/fs/devfs/devfs_devs.c	Tue Aug 16 08:41:09 2011	(r224904)
@@ -505,13 +505,15 @@ devfs_populate_loop(struct devfs_mount *
 void
 devfs_populate(struct devfs_mount *dm)
 {
+	unsigned gen;
 
 	sx_assert(&dm->dm_lock, SX_XLOCKED);
-	if (dm->dm_generation == devfs_generation)
+	gen = devfs_generation;
+	if (dm->dm_generation == gen)
 		return;
 	while (devfs_populate_loop(dm, 0))
 		continue;
-	dm->dm_generation = devfs_generation;
+	dm->dm_generation = gen;
 }
 
 /*