Blame SOURCES/autofs-5.1.1-fix-left-mount-count-return.patch

516ab0
autofs-5.1.1 - fix left mount count return from umount_multi_triggers()
516ab0
516ab0
From: Xu Wang <xuw@redhat.com>
516ab0
516ab0
If a umount of an NFS mount at the root of a multi-mount fails
516ab0
umount_multi_triggers() will return an zero (success) when it should
516ab0
return 1 (a fail). In this case do_expire_direct() will close the
516ab0
me->ioctlfd fd used for expires stopping further expires of the
516ab0
direct mount.
516ab0
516ab0
Signed-off-by: Ian Kent <raven@themaw.net>
516ab0
---
516ab0
 CHANGELOG    |    1 +
516ab0
 lib/mounts.c |    2 +-
516ab0
 2 files changed, 2 insertions(+), 1 deletion(-)
516ab0
516ab0
--- autofs-5.0.7.orig/CHANGELOG
516ab0
+++ autofs-5.0.7/CHANGELOG
516ab0
@@ -170,6 +170,7 @@
516ab0
 - remove unused offset handling code.
516ab0
 - fix mount as you go offset selection.
516ab0
 - init qdn before use in get_query_dn().
516ab0
+- fix left mount count return from umount_multi_triggers().
516ab0
 
516ab0
 25/07/2012 autofs-5.0.7
516ab0
 =======================
516ab0
--- autofs-5.0.7.orig/lib/mounts.c
516ab0
+++ autofs-5.0.7/lib/mounts.c
516ab0
@@ -2130,7 +2130,7 @@ int umount_multi_triggers(struct autofs_
516ab0
 				if (mount_multi_triggers(ap, me, root, strlen(root), "/") < 0)
516ab0
 					warn(ap->logopt,
516ab0
 					     "failed to remount offset triggers");
516ab0
-				return left++;
516ab0
+				return ++left;
516ab0
 			}
516ab0
 		}
516ab0