You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.1 KiB
38 lines
1.1 KiB
7 years ago
|
autofs-5.1.1 - fix left mount count return from umount_multi_triggers()
|
||
|
|
|
||
|
|
From: Xu Wang <xuw@redhat.com>
|
||
|
|
|
||
|
|
If a umount of an NFS mount at the root of a multi-mount fails
|
||
|
|
umount_multi_triggers() will return an zero (success) when it should
|
||
|
|
return 1 (a fail). In this case do_expire_direct() will close the
|
||
|
|
me->ioctlfd fd used for expires stopping further expires of the
|
||
|
|
direct mount.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
||
|
|
---
|
||
|
|
CHANGELOG | 1 +
|
||
|
|
lib/mounts.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- autofs-5.0.7.orig/CHANGELOG
|
||
|
|
+++ autofs-5.0.7/CHANGELOG
|
||
|
|
@@ -170,6 +170,7 @@
|
||
|
|
- remove unused offset handling code.
|
||
|
|
- fix mount as you go offset selection.
|
||
|
|
- init qdn before use in get_query_dn().
|
||
|
|
+- fix left mount count return from umount_multi_triggers().
|
||
|
|
|
||
|
|
25/07/2012 autofs-5.0.7
|
||
|
|
=======================
|
||
|
|
--- autofs-5.0.7.orig/lib/mounts.c
|
||
|
|
+++ autofs-5.0.7/lib/mounts.c
|
||
|
|
@@ -2130,7 +2130,7 @@ int umount_multi_triggers(struct autofs_
|
||
|
|
if (mount_multi_triggers(ap, me, root, strlen(root), "/") < 0)
|
||
|
|
warn(ap->logopt,
|
||
|
|
"failed to remount offset triggers");
|
||
|
|
- return left++;
|
||
|
|
+ return ++left;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|