rpms/autofs/devel autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch, NONE, 1.1 autofs.spec, 1.177, 1.178

[fedora-cvs-commits at redhat.com]

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18057

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch 
Log Message:
* Thu Jan 18 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.11
- correct check for busy offset mounts before offset umount (bz 222872).


autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch:
 CHANGELOG        |    1 +
 lib/parse_subs.c |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 8ca790a..b77c2cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - remove redundant rpath link option.
 - ignore "winbind" if it appears in "automount" nsswitch.conf.
 - fix another expire regression introduced in the "mitigate manual umount" patch.
+- correct check for busy offset mounts before offset umount.
 
 4/1/2007 autofs-5.0.1 rc3
 -------------------------
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index c98989c..6666aa5 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -454,10 +454,12 @@ int umount_multi_triggers(struct autofs_point *ap, char *root, struct mapent *me
 		 * nonstrict mount fail.
 		 */
 		oe_base = oe->key + strlen(root);
-		left = umount_multi_triggers(ap, root, oe, oe_base);
+		left += umount_multi_triggers(ap, root, oe, oe_base);
 
+		debug(LOGOPT_ANY, "check %s %d", oe->key, oe->ioctlfd);
 		if (oe->ioctlfd != -1)
 			left++;
+		debug(LOGOPT_ANY, "left %d", left);
 	}
 
 	if (left)


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- autofs.spec	17 Jan 2007 16:05:41 -0000	1.177
+++ autofs.spec	19 Jan 2007 06:26:36 -0000	1.178
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 %define version 5.0.1
-%define release 0.rc3.9
+%define release 0.rc3.11
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -15,6 +15,7 @@
 Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch
 Patch3: autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch
 Patch4: autofs-5.0.1-rc3-correct-expire-check.patch
+Patch5: autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -117,6 +118,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Jan 18 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.11
+- correct check for busy offset mounts before offset umount (bz 222872).
+
 * Wed Jan 17 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.9
 - fix another expire regression introduced in the "mitigate manual umount"
   patch (bz 222872).