[patch] New upstream patch

autofs-5.0.5-fix-prune-cache-valid-check.patch (text/plain), 826 bytes, created by Dustin Polke on 2011-01-14 08:43:50 UTC

autofs-5.0.5 - fix prune cache valid check

From: Ian Kent <[e-mail]>

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.
---

--- daemon/lookup.c.orig
+++ daemon/lookup.c
@@ -1060,6 +1060,14 @@ void lookup_prune_one_cache(struct autof
 		 * 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,