41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
autofs-5.1.8 - dont call umount_subtree_mounts() on parent at umount
|
||
|
|
|
||
|
|
From: Ian Kent <raven@themaw.net>
|
||
|
|
|
||
|
|
There shouldn't be any multi-mount offsets mounted within a submount
|
||
|
|
because the submount will be a nesting point and offsets will be mounted
|
||
|
|
within it when it gets mounted and expired before it's umounted.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
||
|
|
---
|
||
|
|
CHANGELOG | 1 +
|
||
|
|
daemon/automount.c | 7 -------
|
||
|
|
2 files changed, 1 insertion(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- autofs-5.1.4.orig/CHANGELOG
|
||
|
|
+++ autofs-5.1.4/CHANGELOG
|
||
|
|
@@ -138,6 +138,7 @@
|
||
|
|
- remove redundant stat call in lookup_ghost().
|
||
|
|
- set mapent dev and ino before adding to index.
|
||
|
|
- change to use printf functions in amd parser.
|
||
|
|
+- dont call umount_subtree_mounts() on parent at umount.
|
||
|
|
|
||
|
|
xx/xx/2018 autofs-5.1.5
|
||
|
|
- fix flag file permission.
|
||
|
|
--- autofs-5.1.4.orig/daemon/automount.c
|
||
|
|
+++ autofs-5.1.4/daemon/automount.c
|
||
|
|
@@ -706,13 +706,6 @@ int umount_multi(struct autofs_point *ap
|
||
|
|
|
||
|
|
left = 0;
|
||
|
|
|
||
|
|
- /*
|
||
|
|
- * If we are a submount we need to umount any offsets our
|
||
|
|
- * parent may have mounted over top of us.
|
||
|
|
- */
|
||
|
|
- if (ap->submount)
|
||
|
|
- left += umount_subtree_mounts(ap->parent, path, 1);
|
||
|
|
-
|
||
|
|
left += umount_subtree_mounts(ap, path, is_autofs_fs);
|
||
|
|
|
||
|
|
/* Delete detritus like unwanted mountpoints and symlinks */
|