Drop the cache_enabled hack

cache_enabled leaked the cache.on setting from the cache module abstraction
back into sshfs, and it only did so for the Darwin case.

This hack was being used to avoid calling cache_add_attr and cache_invalidate
when the cache was disabled... but these two functions already do nothing when
in that case: there is no need to do a second check in the caller.

3 files changed, 0 insertions, 21 deletions

diff --git a/cache.c b/cache.c
index ffdf71d..6e93157 100644
--- a/cache.c
+++ b/cache.c
@@ -554,9 +554,6 @@ struct fuse_operations *cache_init(struct fuse_cache_operations *oper)
 	cache.next_oper = oper;
 
 	cache_unity_fill(oper, &cache_oper);
-#if __APPLE__
-	cache_enabled = cache.on;
-#endif
 	if (cache.on) {
 		cache_fill(oper, &cache_oper);
 		pthread_mutex_init(&cache.lock, NULL);
@@ -591,7 +588,3 @@ int cache_parse_options(struct fuse_args *args)
 
 	return fuse_opt_parse(args, &cache, cache_opts, NULL);
 }
-
-#if __APPLE__
-int cache_enabled;
-#endif
diff --git a/cache.h b/cache.h
index 23ff970..cec9ca4 100644
--- a/cache.h
+++ b/cache.h
@@ -27,7 +27,3 @@ int cache_parse_options(struct fuse_args *args);
 void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr);
 void cache_invalidate(const char *path);
 uint64_t cache_get_write_ctr(void);
-
-#if __APPLE__
-extern int cache_enabled;
-#endif
diff --git a/sshfs.c b/sshfs.c
index 6948663..21393f1 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -2591,21 +2591,11 @@ static int sshfs_open_common(const char *path, mode_t mode,
 	}
 
 	if (!err) {
-#ifdef __APPLE__
-		if (cache_enabled)
-			cache_add_attr(path, &stbuf, wrctr);
-#else
 		cache_add_attr(path, &stbuf, wrctr);
-#endif
 		buf_finish(&sf->handle);
 		fi->fh = (unsigned long) sf;
 	} else {
-#ifdef __APPLE__
-		if (cache_enabled)
-			cache_invalidate(path);
-#else
 		cache_invalidate(path);
-#endif
 		g_free(sf);
 	}
 	buf_free(&buf);