|
 |
ab3a3d |
autofs-5.0.7 - fix submount offset delete
|
|
|
ab3a3d |
|
|
|
ab3a3d |
From: Ian Kent <ikent@redhat.com>
|
|
|
ab3a3d |
|
|
|
ab3a3d |
As part of the implementation to allow for limited update of
|
|
|
ab3a3d |
the internal hosts map by using a HUP signal some code that
|
|
|
ab3a3d |
deleted any offset entries from the cache on lookup was removed
|
|
|
ab3a3d |
as it appeared to not be needed.
|
|
|
ab3a3d |
|
|
|
ab3a3d |
There is however a case where it is needed to avoid a duplicate
|
|
|
ab3a3d |
cache entry failure on lookup.
|
|
|
ab3a3d |
---
|
|
|
ab3a3d |
|
|
|
ab3a3d |
CHANGELOG | 1 +
|
|
|
ab3a3d |
daemon/automount.c | 4 ++--
|
|
|
ab3a3d |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
ab3a3d |
|
|
|
ab3a3d |
|
|
|
ab3a3d |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
ab3a3d |
index 7eb7235..76c1f73 100644
|
|
|
ab3a3d |
--- a/CHANGELOG
|
|
|
ab3a3d |
+++ b/CHANGELOG
|
|
|
ab3a3d |
@@ -18,6 +18,7 @@
|
|
|
ab3a3d |
- fix map entry duplicate offset detection.
|
|
|
ab3a3d |
- Allow nsswitch.conf to not contain "automount:" lines.
|
|
|
ab3a3d |
- fix nobind man page description.
|
|
|
ab3a3d |
+- fix submount offset delete.
|
|
|
ab3a3d |
|
|
|
ab3a3d |
25/07/2012 autofs-5.0.7
|
|
|
ab3a3d |
=======================
|
|
|
ab3a3d |
diff --git a/daemon/automount.c b/daemon/automount.c
|
|
|
ab3a3d |
index e56f9e1..4a3eb3d 100644
|
|
|
ab3a3d |
--- a/daemon/automount.c
|
|
|
ab3a3d |
+++ b/daemon/automount.c
|
|
|
ab3a3d |
@@ -544,8 +544,8 @@ int umount_multi(struct autofs_point *ap, const char *path, int incl)
|
|
|
ab3a3d |
* If we are a submount we need to umount any offsets our
|
|
|
ab3a3d |
* parent may have mounted over top of us.
|
|
|
ab3a3d |
*/
|
|
|
ab3a3d |
- /*if (ap->submount)
|
|
|
ab3a3d |
- left += umount_subtree_mounts(ap->parent, path, is_autofs_fs);*/
|
|
|
ab3a3d |
+ if (ap->submount)
|
|
|
ab3a3d |
+ left += umount_subtree_mounts(ap->parent, path, is_autofs_fs);
|
|
|
ab3a3d |
|
|
|
ab3a3d |
left += umount_subtree_mounts(ap, path, is_autofs_fs);
|
|
|
ab3a3d |
|