|
 |
304803 |
autofs-5.0.8 - dont ignore null cache entries on multi mount umount
|
|
|
304803 |
|
|
|
304803 |
From: Ian Kent <raven@themaw.net>
|
|
|
304803 |
|
|
|
304803 |
When umounting the offsets of a multi-mount negative cache entries
|
|
|
304803 |
shouldn't be ignored. Even if the mount they correspond to failed to
|
|
|
304803 |
mount the trigger still needs to be umounted.
|
|
|
304803 |
|
|
|
304803 |
Not ignoring negative entries when cleaning stale multi-mount entries
|
|
|
304803 |
isn't obviously the right thing to do but, since the multi-mount entry
|
|
|
304803 |
should have been refreshed, there shouldn't be any valid negative entries
|
|
|
304803 |
so they must be stale and need to go.
|
|
|
304803 |
---
|
|
|
304803 |
CHANGELOG | 1 +
|
|
|
304803 |
lib/mounts.c | 4 ++--
|
|
|
304803 |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
304803 |
|
|
|
304803 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
304803 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
304803 |
@@ -97,6 +97,7 @@
|
|
|
304803 |
- fix map source with type lookup.
|
|
|
304803 |
- fix fix map source with type lookup.
|
|
|
304803 |
- fix lookup_nss_mount() map lookup.
|
|
|
304803 |
+- dont ignore null cache entries on multi mount umount.
|
|
|
304803 |
|
|
|
304803 |
25/07/2012 autofs-5.0.7
|
|
|
304803 |
=======================
|
|
|
304803 |
--- autofs-5.0.7.orig/lib/mounts.c
|
|
|
304803 |
+++ autofs-5.0.7/lib/mounts.c
|
|
|
304803 |
@@ -1804,7 +1804,7 @@ int umount_multi_triggers(struct autofs_
|
|
|
304803 |
|
|
|
304803 |
oe = cache_lookup_offset(mm_base, offset, start, &me->multi_list);
|
|
|
304803 |
/* root offset is a special case */
|
|
|
304803 |
- if (!oe || !oe->mapent || (strlen(oe->key) - start) == 1)
|
|
|
304803 |
+ if (!oe || (strlen(oe->key) - start) == 1)
|
|
|
304803 |
continue;
|
|
|
304803 |
|
|
|
304803 |
/*
|
|
|
304803 |
@@ -1926,7 +1926,7 @@ int clean_stale_multi_triggers(struct au
|
|
|
304803 |
|
|
|
304803 |
oe = cache_lookup_offset(mm_base, offset, start, &me->multi_list);
|
|
|
304803 |
/* root offset is a special case */
|
|
|
304803 |
- if (!oe || !oe->mapent || (strlen(oe->key) - start) == 1)
|
|
|
304803 |
+ if (!oe || (strlen(oe->key) - start) == 1)
|
|
|
304803 |
continue;
|
|
|
304803 |
|
|
|
304803 |
/* Check for and umount stale subtree offsets */
|