Attachment 308945 Details for Bug 450844 – clean the cache when re-reading the map

[patch] clean the cache when re-reading the map

autofs-4.1.3-release-cache-on-map-reread.patch (text/plain), 1.37 KB, created by Jeff Moyer on 2008-06-11 15:38:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Moyer

Created: 2008-06-11 15:38:50 UTC

Size: 1.37 KB

patch

obsolete

>--- autofs-4.1.3/daemon/automount.c.orig	2008-06-11 10:47:26.000000000 -0400
>+++ autofs-4.1.3/daemon/automount.c	2008-06-11 10:47:33.000000000 -0400
>@@ -1055,6 +1055,7 @@
> 	int status;
> 
> 	info("automount: re-reading configuration.\n");
>+	cache_release();
> 	status = ap.lookup->lookup_ghost(ap.path, ap.ghost, 0, ap.lookup->context);
> 
> 	debug("st_readmap: status %d\n", status);
>--- autofs-4.1.3/lib/cache.c.orig	2008-03-26 13:00:33.000000000 -0400
>+++ autofs-4.1.3/lib/cache.c	2008-06-11 11:26:57.000000000 -0400
>@@ -272,7 +272,7 @@
> 		if (me->age == age)
> 			return CHE_OK;
> 
>-		if (strcmp(me->mapent, mapent) != 0) {
>+		if (!me->mapent || strcmp(me->mapent, mapent) != 0) {
> 			pent = malloc(strlen(mapent) + 1);
> 			if (pent == NULL) {
> 				return CHE_FAIL;
>@@ -437,6 +437,17 @@
> 
> 		while (me != NULL) {
> 			strcpy(gc.key, me->key);
>+			/*
>+			 * cache_ghost should always be called with a
>+			 * newly created cache and, as such, should not
>+			 * run into any negative cache entries.
>+			 */
>+			if (!me->mapent) {
>+				error("%s: unexpected negative cache entry",
>+				      __func__);
>+				me = me->next;
>+				continue;
>+			}
> 			strcpy(gc.mapent, me->mapent);
> 
> 			match = ent_check(&gc, &pkey, ghosted);
>@@ -450,7 +461,7 @@
> 					error("cache_ghost: wildcard map key "
> 					      "not valid in direct map");
> 				me = me->next;
>-				continue;;
>+				continue;
> 			}
> 
> 			switch (match) {

Actions: View | Diff

Attachments on bug 450844: 308945 | 309516 | 309862