autofs-5.0.5 - fix prune cache valid check From: Ian Kent During a map reload, when pruning the cache we look for a valid map entry in another map. In lookup_prune_one_cache() There is a missing check for the entry being in the current map which causes the directory cleanup code from doing its job. --- CHANGELOG | 1 + daemon/lookup.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5c1005a..5ad2836 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -58,6 +58,7 @@ - use weight only for server selection. - fix isspace() wild card substition. - auto adjust ldap page size. +- fix prune cache valid check. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/daemon/lookup.c b/daemon/lookup.c index a9a1f4d..36e60c9 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c @@ -1060,6 +1060,14 @@ void lookup_prune_one_cache(struct autofs_point *ap, struct mapent_cache *mc, ti * cache entry. */ valid = lookup_source_valid_mapent(ap, key, LKP_DISTINCT); + if (valid && valid->mc == mc) { + /* + * We've found a map entry that has been removed from + * the current cache so it isn't really valid. + */ + cache_unlock(valid->mc); + valid = NULL; + } if (!valid && is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) { debug(ap->logopt,