Date: Tue, 16 Aug 2011 09:06:44 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r224906 - stable/7/sys/fs/devfs Message-ID: <201108160906.p7G96iqn049608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Aug 16 09:06:44 2011 New Revision: 224906 URL: http://svn.freebsd.org/changeset/base/224906 Log: MFC r224743: Do not update mountpoint generation counter to the value which was not yet acted upon by devfs_populate(). Modified: stable/7/sys/fs/devfs/devfs_devs.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_devs.c ============================================================================== --- stable/7/sys/fs/devfs/devfs_devs.c Tue Aug 16 08:41:37 2011 (r224905) +++ stable/7/sys/fs/devfs/devfs_devs.c Tue Aug 16 09:06:44 2011 (r224906) @@ -481,13 +481,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; } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108160906.p7G96iqn049608>