aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--cache.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e3d32f6..352705e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
* Fix error if username contains a comma character. Reported by
Yang Zhang
+ * Fix harmless glib assertations with "cache=no"
+
2008-07-11 Miklos Szeredi <miklos@szeredi.hu>
* Released 2.1
diff --git a/cache.c b/cache.c
index c6be742..bb23f8f 100644
--- a/cache.c
+++ b/cache.c
@@ -105,6 +105,9 @@ static void cache_purge_parent(const char *path)
void cache_invalidate(const char *path)
{
+ if (!cache.on)
+ return;
+
pthread_mutex_lock(&cache.lock);
cache_purge(path);
pthread_mutex_unlock(&cache.lock);
@@ -163,6 +166,9 @@ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
struct node *node;
time_t now;
+ if (!cache.on)
+ return;
+
pthread_mutex_lock(&cache.lock);
if (wrctr == cache.write_ctr) {
node = cache_get(path);