diff options
author | Julio Merino <jmmv@google.com> | 2016-02-08 11:43:01 -0500 |
---|---|---|
committer | Julio Merino <jmmv@meroh.net> | 2016-02-08 20:50:22 -0500 |
commit | d8230e72ca01fd27509ef7134f0957c73f164ae3 (patch) | |
tree | 2dac21fc3dc0ab2dd2103350d08e560177c634a5 | |
parent | e0025219b33de3cbf3152884b48412feb461c894 (diff) | |
download | sshfs-d8230e72ca01fd27509ef7134f0957c73f164ae3.tar sshfs-d8230e72ca01fd27509ef7134f0957c73f164ae3.tar.gz sshfs-d8230e72ca01fd27509ef7134f0957c73f164ae3.tar.bz2 sshfs-d8230e72ca01fd27509ef7134f0957c73f164ae3.zip |
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.
-rw-r--r-- | cache.c | 7 | ||||
-rw-r--r-- | cache.h | 4 | ||||
-rw-r--r-- | sshfs.c | 10 |
3 files changed, 0 insertions, 21 deletions
@@ -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 @@ -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 @@ -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); |