Released 3.2.0

Not supported on OS X, and not strictly necessary.

Fixes: #64.

.travis.yml

@@ -12,9 +12,6 @@ addons:
     - clang
     - gcc
     - gcc-6
-    - fuse
-    - libfuse2
-    - libfuse-dev
 before_install:
    - pip install pip==8.1.1 && pip3 install pip==8.1.1
 install: test/travis-install.sh

AUTHORS

@@ -21,6 +21,7 @@ Bill Zissimopoulos <billziss@navimatics.com>
 Chris Wolfe <cwolfe@chromium.org>
 gala <gala132@users.noreply.github.com>
 George Vlahavas <vlahavas@gmail.com>
+harrim4n <git@harrim4n.com>
 Jakub Jelen <jjelen@redhat.com>
 Julio Merino <jmmv@google.com>
 Julio Merino <jmmv@meroh.net>

ChangeLog.rst

@@ -1,9 +1,31 @@
-Release 2.10 (2017-08-03)
--------------------------
+Release 3.2.0 (2017-08-06)
+--------------------------
+
+* Re-enabled writeback cache.
+* SSHFS now supports O_APPEND.
+
+Release 3.1.0 (2017-08-04)
+--------------------------
+
+* Temporarily disabled the writeback cache feature, since there
+  have been reports of dataloss when appending to files when
+  writeback caching is enabled.
 
 * Fixed a crash due to a race condition when listing
   directory contents.
+
+* For improved backwards compatibility, SSHFS now also silently
+  accepts the old ``-o cache_*`` options.
+  
+Release 3.0.0 (2017-07-08)
+--------------------------
+
+* sshfs now requires libfuse 3.1.0 or newer.
+* When supported by the kernel, sshfs now uses writeback caching.
+* The `cache` option has been renamed to `dir_cache` for clarity.  
 * Added unit tests
+* --debug now behaves like -o debug_sshfs, i.e. it enables sshfs
+  debugging messages rather than libfuse debugging messages.
 * Documented limited hardlink support.
 * Added support for building with Meson.
 * Added support for more SSH options.

FAQ

@@ -6,30 +6,26 @@ SSHFS FAQ
 2.     Advantage of sshfs over NFS and Samba
 3.     Create the device node
 4.     mv fails with "Operation not permitted"
-5.     cvs fails with "cvs [status aborted]: cannot get working
-       directory: No such file or directory" in a sshfs mounted directory
-6.     Changes on the server are not immediately visible in the
-       mounted directory.
-7.     Configuring the ssh connection
-8.     What are the no_readahead and sshfs_sync options for?
-9.    Why does df return strange values on partitions mounted via
+5.     Configuring the ssh connection
+6.     What are the no_readahead and sshfs_sync options for?
+7.     Why does df return strange values on partitions mounted via
        sshfs?
-10.    How do I specify the remote mount point (since the example
+8.     How do I specify the remote mount point (since the example
        defaults to the home directory)
-11.    sshfs hangs after a while
-12.    Following symlinks on the server side
-13.    Making absolute symlinks work
-14.    Mounting as root
-15.    Exporting via NFS
-16.    Automatical mounting using /etc/fstab
-17.    Why does SVN (etc...) fail with permission denied?
-18.    Why does SVN (etc...) fail to rename files?
-19.    Is there some neat way to do it in reverse?
-20.    Might it be reasonable to disallow loops?
-21.    How to mount through an intermediary ssh server, eg:
+9.     sshfs hangs after a while
+10.    Following symlinks on the server side
+11.    Making absolute symlinks work
+12.    Mounting as root
+13.    Exporting via NFS
+14.    Automatical mounting using /etc/fstab
+15.    Why does SVN (etc...) fail with permission denied?
+16.    Why does SVN (etc...) fail to rename files?
+17.    Is there some neat way to do it in reverse?
+18.    Might it be reasonable to disallow loops?
+19.    How to mount through an intermediary ssh server, eg:
        localhost -> A -> B; mount B from localhost
-22.    Alternative Solution
-23.    I seem to have successfully mounted a remote directory, but
+20.    Alternative Solution
+21.    I seem to have successfully mounted a remote directory, but
        performing an `ls -l` on the directory above the mount point shows
        the mount point's attributes as `? ? ? ? ? ?`. Nothing shows up in
        the directory either. What am I doing wrong?
@@ -82,80 +78,63 @@ SSHFS FAQ
 
    Use -o workaround=rename (requires sshfs version >= 1.3).
 
-5. cvs fails with "cvs status aborted?: cannot get working directory: No such
-   file or directory" in a sshfs mounted directory
-
-   Use the -oreaddir_ino option. Example:
-     sshfs -oreaddir_ino hostname:remote_dir mount_point
-
-6. Changes on the server are not immediately visible in the mounted directory.
-
-   By default, sshfs caches things for 20 seconds, use -o cache_timeout=N
-   to change the default cache timeout (in seconds) or -o cache=no for
-   disabling the cache.
-
-   You can also control cache timeouts for directory listing etc with
-   -o cache_stat_timeout=N,
-   -o cache_dir_timout=N, and
-   -o cache_link_timout=N.
-
-7. Configuring the ssh connection
+5. Configuring the ssh connection
 
    In addition to flags like -C, -p, and -o SSHOPT...=, you may find it
    easier to edit your /.ssh/config file. You can add an entry with any
    customization you want, test it with ssh, and finally use it with
    sshfs. As a bonus, you get a short mnemonic for your configuration.
 
-8. What are the no_readahead and sshfs_sync options for?
+6. What are the no_readahead and sshfs_sync options for?
 
    These disable read and write optimizations respectively. They don't
    really make sense unless you're doing something special.
 
-9. Why does df return strange values on partitions mounted via sshfs?
+7. Why does df return strange values on partitions mounted via sshfs?
 
    Because the SFTP protocol doesn't have a statfs operation this is
    currently not possible to display proper usage on remote partition.
 
-10. How do I specfy the remote mount point (since the example defaults to the
-    home directory)
+8. How do I specfy the remote mount point (since the example defaults to the
+   home directory)
 
-    The example shows:
-      sshfs hostname: mountpoint
+   The example shows:
+     sshfs hostname: mountpoint
 
-    To specify a remote mount point use:
-      sshfs hostname:remotemountpoint mountpoint
+   To specify a remote mount point use:
+     sshfs hostname:remotemountpoint mountpoint
 
-    This might be obvious to others, but I ended up looking up the
-    interface to sftp to see if I could learn how to specify the remote
-    mount point, then thought about the way that scp specifies the remote
-    directory, and it worked.
+   This might be obvious to others, but I ended up looking up the
+   interface to sftp to see if I could learn how to specify the remote
+   mount point, then thought about the way that scp specifies the remote
+   directory, and it worked.
 
-11. sshfs hangs after a while
+9. sshfs hangs after a while
 
-    Mounting works fine, I can use the files in Mountpoint as good as any
-    other files on my system, but after bit of time, changing nothing on
-    the remote files sshfs crashes. This means, I can not cd into the
-    Mountpoint (xterm hangs, nautilus hangs... every program trying to
-    access the Mountpoint gets stuck, and won't return).
+   Mounting works fine, I can use the files in Mountpoint as good as any
+   other files on my system, but after bit of time, changing nothing on
+   the remote files sshfs crashes. This means, I can not cd into the
+   Mountpoint (xterm hangs, nautilus hangs... every program trying to
+   access the Mountpoint gets stuck, and won't return).
 
-    Solution: add
-      ServerAliveInterval 15
+   Solution: add
+     ServerAliveInterval 15
 
-    in your .ssh/config (or use -o ServerAliveInterval=15 on the sshfs
-    command line but I did not test that solution). This will force the
-    ssh connection to stay alive even if you have no activity.
+   in your .ssh/config (or use -o ServerAliveInterval=15 on the sshfs
+   command line but I did not test that solution). This will force the
+   ssh connection to stay alive even if you have no activity.
 
-12. Following symlinks on the server side
+10. Following symlinks on the server side
 
     The -o follow_symlinks option will enable this.
 
-13. Making absolute symlinks work
+11. Making absolute symlinks work
 
     Use the -o transform_symlinks option, which will transform absolute
     symlinks (ones which point somewhere inside the mount) into relative
     ones.
 
-14. Mounting as root
+12. Mounting as root
 
     Generally it's not possible to use an sshfs mount as a "real"
     filesystem shared between multiple users. Some of this functionality
@@ -163,11 +142,11 @@ SSHFS FAQ
     options, but files will not be created with the correct ownership,
     etc...
 
-15. Exporting via NFS
+13. Exporting via NFS
 
     Use the userspace NFS daemon http://sourceforge.net/projects/unfs
 
-16. Automatical mounting using /etc/fstab
+14. Automatical mounting using /etc/fstab
 
     A line in /etc/fstab has the following format:
       sshfs#USERNAME@REMOTE_HOST:REMOTE_PATH MOUNT_POINT fuse SSHFS_OPTIONS 0 0
@@ -176,7 +155,7 @@ SSHFS FAQ
       sshfs#guest@guest.login.com:data /mnt/guest fuse \
         uid=1003,gid=100,umask=0,allow_other 0 0
 
-17. Why does SVN (etc...) fail with permission denied?
+15. Why does SVN (etc...) fail with permission denied?
 
     This is a bug that happens when an application creates a read-only
     file opened for writing (e.g. open("foo", O_WRONLY|O_CREAT, 0444))
@@ -184,7 +163,7 @@ SSHFS FAQ
     It has been fixed in sshfs version 1.3, but also requires FUSE version
     >=2.5.X and Linux kernel version >=2.6.15.
 
-18. Why does SVN (etc...) fail to rename files?
+16. Why does SVN (etc...) fail to rename files?
 
     $ svn co svn://anonsvn.kde.org/home/kde/trunk/KDE/kdelibs
     svn: Can't move 'kdelibs/.svn/tmp/entries' to 'kdelibs/.svn/entries':
@@ -200,7 +179,7 @@ SSHFS FAQ
     semantics, but it cannot guarantee atomicity. In most of the cases
     this doesn't matter, and things will work fine with this option.
 
-19. Is there some neat way to do it in reverse?
+17. Is there some neat way to do it in reverse?
 
     You want to mount a USB thumb drive onto a file server that is rather
     remote.
@@ -214,13 +193,13 @@ SSHFS FAQ
     (Now, is there is there a smarter way that does not involve port
     opening login permissions in an undesireable direction?)
 
-20. Might it be reasonable to disallow loops?
+18. Might it be reasonable to disallow loops?
 
     sshfs localhost:/mnt /mnt
 
     This seems to produce undesirable results. --JoshuaRodman
 
-21. How to mount through an intermediary ssh server, eg: localhost -> A -> B;
+19. How to mount through an intermediary ssh server, eg: localhost -> A -> B;
     mount B from localhost
 
     Start by mounting the folder you need that is on "a" to a folder on
@@ -230,7 +209,7 @@ SSHFS FAQ
     A mounts B:/home/x on /mnt/Bx
     localhost mounts A:/mnt/Bx on ~/mydir
 
-22. Alternative Solution:
+20. Alternative Solution:
 
     1) Create a shell script to wrap the tunneling of one ssh command over
     another,
@@ -244,7 +223,7 @@ SSHFS FAQ
     normal but using this script as the ssh command.
       $ sshfs -o ssh_command='Atunnel' B: ~/mydir
 
-23. I seem to have successfully mounted a remote directory, but performing an
+21. I seem to have successfully mounted a remote directory, but performing an
     `ls -l` on the directory above the mount point shows the mount point's
     attributes as `? ? ? ? ? ?`. Nothing shows up in the directory either. What
     am I doing wrong?

Makefile.am

@@ -14,10 +14,10 @@ endif
 
 sshfs_LDADD = $(SSHFS_LIBS)
 sshfs_CFLAGS = $(SSHFS_CFLAGS)
-sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\" \
+sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=31 -DLIBDIR=\"$(libdir)\" \
                  -DIDMAP_DEFAULT="\"$(IDMAP_DEFAULT)\""
 
-EXTRA_DIST = sshfs.1.in meson.build
+EXTRA_DIST = sshfs.1.in meson.build ChangeLog.rst
 CLEANFILES = sshfs.1 sshfs.1.tmp
 
 dist_man_MANS = sshfs.1

README.rst

@@ -42,9 +42,10 @@ Installation
 
 First, download the latest SSHFS release from
 https://github.com/libfuse/sshfs/releases. On Linux and BSD, you will
-also need to have libfuse_ installed. On OS-X, you need OSXFUSE_
-instead. Finally, you need the Glib_ development package (which should
-be available from your operating system's package manager).
+also need to install libfuse_ 3.1.0 or newer. On OS-X, you need
+OSXFUSE_ instead. Finally, you need the Glib_ library with development
+headers (which should be available from your operating system's
+package manager).
 
 To build and install, we recommend to use Meson_ (version 0.38 or
 newer) and Ninja_.  After extracting the sshfs tarball, create a
@@ -115,6 +116,16 @@ individual files when seen through an SSHFS mount, i.e. they will
 appear to have different inodes and an *st_nlink* value of 1.
 
 
+O_APPEND
+~~~~~~~~
+
+When writeback caching is enabled, SSHFS cannot reliably support the
+``O_APPEND`` open flag and thus signals an error on open.  To enable
+support for unreliable ``O_APPEND`` (which may overwrite data if the
+file changes on the server at a bad time), mount the file system with
+``-o unreliable_append``.
+
+
 Getting Help
 ------------
 

cache.c

@@ -8,6 +8,7 @@
 
 #include "cache.h"
 #include <stdio.h>
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -27,7 +28,7 @@ struct cache {
 	unsigned int max_size;
 	unsigned int clean_interval_secs;
 	unsigned int min_clean_interval_secs;
-	struct fuse_cache_operations *next_oper;
+	struct fuse_operations *next_oper;
 	GHashTable *table;
 	pthread_mutex_t lock;
 	time_t last_cleaned;
@@ -46,14 +47,22 @@ struct node {
 	time_t valid;
 };
 
-struct fuse_cache_dirhandle {
+struct readdir_handle {
 	const char *path;
-	fuse_dirh_t h;
-	fuse_dirfil_t filler;
+	void *buf;
+	fuse_fill_dir_t filler;
 	GPtrArray *dir;
 	uint64_t wrctr;
 };
 
+struct file_handle {
+	/* Did we send an open request to the underlying fs? */
+	int is_open;
+
+	/* If so, this will hold its handle */
+	unsigned long fs_fh;
+};
+
 static void free_node(gpointer node_)
 {
 	struct node *node = (struct node *) node_;
@@ -108,15 +117,12 @@ 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);
 }
 
-void cache_invalidate_write(const char *path)
+static void cache_invalidate_write(const char *path)
 {
 	pthread_mutex_lock(&cache.lock);
 	cache_purge(path);
@@ -168,9 +174,6 @@ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
 {
 	struct node *node;
 
-	if (!cache.on)
-		return;
-
 	pthread_mutex_lock(&cache.lock);
 	if (wrctr == cache.write_ctr) {
 		node = cache_get(path);
@@ -248,12 +251,25 @@ uint64_t cache_get_write_ctr(void)
 	return res;
 }
 
-static int cache_getattr(const char *path, struct stat *stbuf)
+static void *cache_init(struct fuse_conn_info *conn,
+                        struct fuse_config *cfg)
+{
+	void *res;
+	res = cache.next_oper->init(conn, cfg);
+	
+	// Cache requires a path for each request
+        cfg->nullpath_ok = 0;
+
+	return res;
+}
+
+static int cache_getattr(const char *path, struct stat *stbuf,
+			 struct fuse_file_info *fi)
 {
 	int err = cache_get_attr(path, stbuf);
 	if (err) {
 		uint64_t wrctr = cache_get_write_ctr();
-		err = cache.next_oper->oper.getattr(path, stbuf);
+		err = cache.next_oper->getattr(path, stbuf, fi);
 		if (!err)
 			cache_add_attr(path, stbuf, wrctr);
 	}
@@ -277,17 +293,53 @@ static int cache_readlink(const char *path, char *buf, size_t size)
 		}
 	}
 	pthread_mutex_unlock(&cache.lock);
-	err = cache.next_oper->oper.readlink(path, buf, size);
+	err = cache.next_oper->readlink(path, buf, size);
 	if (!err)
 		cache_add_link(path, buf, size);
 
 	return err;
 }
 
-static int cache_dirfill(fuse_cache_dirh_t ch, const char *name,
-                         const struct stat *stbuf)
+
+static int cache_opendir(const char *path, struct fuse_file_info *fi)
 {
-	int err = ch->filler(ch->h, name, 0, 0);
+	(void) path;
+	struct file_handle *cfi;
+
+	cfi = malloc(sizeof(struct file_handle));
+	if(cfi == NULL)
+		return -ENOMEM;
+	cfi->is_open = 0;
+	fi->fh = (unsigned long) cfi;
+	return 0;
+}
+
+static int cache_releasedir(const char *path, struct fuse_file_info *fi)
+{
+	int err;
+	struct file_handle *cfi;
+	
+	cfi = (struct file_handle*) fi->fh;
+	
+	if(cfi->is_open) {
+		fi->fh = cfi->fs_fh;
+		err = cache.next_oper->releasedir(path, fi);
+	} else
+		err = 0;
+
+	free(cfi);
+	return err;
+}
+
+static int cache_dirfill (void *buf, const char *name,
+			  const struct stat *stbuf, off_t off,
+			  enum fuse_fill_dir_flags flags)
+{
+	int err;
+	struct readdir_handle *ch;
+
+	ch = (struct readdir_handle*) buf;
+	err = ch->filler(ch->buf, name, stbuf, off, flags);
 	if (!err) {
 		g_ptr_array_add(ch->dir, g_strdup(name));
 		if (stbuf->st_mode & S_IFMT) {
@@ -302,61 +354,66 @@ static int cache_dirfill(fuse_cache_dirh_t ch, const char *name,
 	return err;
 }
 
-static int cache_getdir(const char *path, fuse_dirh_t h, fuse_dirfil_t filler)
+static int cache_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+			 off_t offset, struct fuse_file_info *fi,
+			 enum fuse_readdir_flags flags)
 {
-	struct fuse_cache_dirhandle ch;
+	struct readdir_handle ch;
+	struct file_handle *cfi;
 	int err;
 	char **dir;
 	struct node *node;
 
+	assert(offset == 0);
+	
 	pthread_mutex_lock(&cache.lock);
 	node = cache_lookup(path);
 	if (node != NULL && node->dir != NULL) {
 		time_t now = time(NULL);
 		if (node->dir_valid - now >= 0) {
 			for(dir = node->dir; *dir != NULL; dir++)
-				filler(h, *dir, 0, 0);
+				// FIXME: What about st_mode?
+				filler(buf, *dir, NULL, 0, 0);
 			pthread_mutex_unlock(&cache.lock);
 			return 0;
 		}
 	}
 	pthread_mutex_unlock(&cache.lock);
 
+	cfi = (struct file_handle*) fi->fh;
+	if(cfi->is_open)
+		fi->fh = cfi->fs_fh;
+	else {
+		if(cache.next_oper->opendir) {
+			err = cache.next_oper->opendir(path, fi);
+			if(err)
+				return err;
+		}
+		cfi->is_open = 1;
+		cfi->fs_fh = fi->fh;
+	} 
+	
 	ch.path = path;
-	ch.h = h;
+	ch.buf = buf;
 	ch.filler = filler;
 	ch.dir = g_ptr_array_new();
 	ch.wrctr = cache_get_write_ctr();
-	err = cache.next_oper->cache_getdir(path, &ch, cache_dirfill);
+	err = cache.next_oper->readdir(path, &ch, cache_dirfill, offset, fi, flags);
 	g_ptr_array_add(ch.dir, NULL);
 	dir = (char **) ch.dir->pdata;
-	if (!err)
+	if (!err) {
 		cache_add_dir(path, dir);
-	else
+	} else {
 		g_strfreev(dir);
+	}
 	g_ptr_array_free(ch.dir, FALSE);
+
 	return err;
 }
 
-static int cache_unity_dirfill(fuse_cache_dirh_t ch, const char *name,
-                               const struct stat *stbuf)
-{
-	(void) stbuf;
-	return ch->filler(ch->h, name, 0, 0);
-}
-
-static int cache_unity_getdir(const char *path, fuse_dirh_t h,
-                              fuse_dirfil_t filler)
-{
-	struct fuse_cache_dirhandle ch;
-	ch.h = h;
-	ch.filler = filler;
-	return cache.next_oper->cache_getdir(path, &ch, cache_unity_dirfill);
-}
-
 static int cache_mknod(const char *path, mode_t mode, dev_t rdev)
 {
-	int err = cache.next_oper->oper.mknod(path, mode, rdev);
+	int err = cache.next_oper->mknod(path, mode, rdev);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -364,7 +421,7 @@ static int cache_mknod(const char *path, mode_t mode, dev_t rdev)
 
 static int cache_mkdir(const char *path, mode_t mode)
 {
-	int err = cache.next_oper->oper.mkdir(path, mode);
+	int err = cache.next_oper->mkdir(path, mode);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -372,7 +429,7 @@ static int cache_mkdir(const char *path, mode_t mode)
 
 static int cache_unlink(const char *path)
 {
-	int err = cache.next_oper->oper.unlink(path);
+	int err = cache.next_oper->unlink(path);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -380,7 +437,7 @@ static int cache_unlink(const char *path)
 
 static int cache_rmdir(const char *path)
 {
-	int err = cache.next_oper->oper.rmdir(path);
+	int err = cache.next_oper->rmdir(path);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -388,15 +445,15 @@ static int cache_rmdir(const char *path)
 
 static int cache_symlink(const char *from, const char *to)
 {
-	int err = cache.next_oper->oper.symlink(from, to);
+	int err = cache.next_oper->symlink(from, to);
 	if (!err)
 		cache_invalidate_dir(to);
 	return err;
 }
 
-static int cache_rename(const char *from, const char *to)
+static int cache_rename(const char *from, const char *to, unsigned int flags)
 {
-	int err = cache.next_oper->oper.rename(from, to);
+	int err = cache.next_oper->rename(from, to, flags);
 	if (!err)
 		cache_do_rename(from, to);
 	return err;
@@ -404,7 +461,7 @@ static int cache_rename(const char *from, const char *to)
 
 static int cache_link(const char *from, const char *to)
 {
-	int err = cache.next_oper->oper.link(from, to);
+	int err = cache.next_oper->link(from, to);
 	if (!err) {
 		cache_invalidate(from);
 		cache_invalidate_dir(to);
@@ -412,33 +469,28 @@ static int cache_link(const char *from, const char *to)
 	return err;
 }
 
-static int cache_chmod(const char *path, mode_t mode)
+static int cache_chmod(const char *path, mode_t mode,
+                       struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.chmod(path, mode);
+	int err = cache.next_oper->chmod(path, mode, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
 }
 
-static int cache_chown(const char *path, uid_t uid, gid_t gid)
+static int cache_chown(const char *path, uid_t uid, gid_t gid,
+                       struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.chown(path, uid, gid);
+	int err = cache.next_oper->chown(path, uid, gid, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
 }
 
-static int cache_truncate(const char *path, off_t size)
+static int cache_utimens(const char *path, const struct timespec tv[2],
+			 struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.truncate(path, size);
-	if (!err)
-		cache_invalidate(path);
-	return err;
-}
-
-static int cache_utime(const char *path, struct utimbuf *buf)
-{
-	int err = cache.next_oper->oper.utime(path, buf);
+	int err = cache.next_oper->utimens(path, tv, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
@@ -447,140 +499,95 @@ static int cache_utime(const char *path, struct utimbuf *buf)
 static int cache_write(const char *path, const char *buf, size_t size,
                        off_t offset, struct fuse_file_info *fi)
 {
-	int res = cache.next_oper->oper.write(path, buf, size, offset, fi);
+	int res = cache.next_oper->write(path, buf, size, offset, fi);
 	if (res >= 0)
 		cache_invalidate_write(path);
 	return res;
 }
 
-#if FUSE_VERSION >= 25
 static int cache_create(const char *path, mode_t mode,
                         struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.create(path, mode, fi);
+	int err = cache.next_oper->create(path, mode, fi);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
 }
 
-static int cache_ftruncate(const char *path, off_t size,
-                           struct fuse_file_info *fi)
+static int cache_truncate(const char *path, off_t size,
+			  struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.ftruncate(path, size, fi);
+	int err = cache.next_oper->truncate(path, size, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
 }
 
-static int cache_fgetattr(const char *path, struct stat *stbuf,
-                          struct fuse_file_info *fi)
-{
-	int err = cache_get_attr(path, stbuf);
-	if (err) {
-		uint64_t wrctr = cache_get_write_ctr();
-		err = cache.next_oper->oper.fgetattr(path, stbuf, fi);
-		if (!err)
-			cache_add_attr(path, stbuf, wrctr);
-	}
-	return err;
-}
-#endif
-
-static void cache_unity_fill(struct fuse_cache_operations *oper,
-                             struct fuse_operations *cache_oper)
-{
-#if FUSE_VERSION >= 23
-	cache_oper->init        = oper->oper.init;
-#endif
-	cache_oper->getattr     = oper->oper.getattr;
-	cache_oper->access	= oper->oper.access;
-	cache_oper->readlink    = oper->oper.readlink;
-	cache_oper->getdir      = cache_unity_getdir;
-	cache_oper->mknod       = oper->oper.mknod;
-	cache_oper->mkdir       = oper->oper.mkdir;
-	cache_oper->symlink     = oper->oper.symlink;
-	cache_oper->unlink      = oper->oper.unlink;
-	cache_oper->rmdir       = oper->oper.rmdir;
-	cache_oper->rename      = oper->oper.rename;
-	cache_oper->link        = oper->oper.link;
-	cache_oper->chmod       = oper->oper.chmod;
-	cache_oper->chown       = oper->oper.chown;
-	cache_oper->truncate    = oper->oper.truncate;
-	cache_oper->utime       = oper->oper.utime;
-	cache_oper->open        = oper->oper.open;
-	cache_oper->read        = oper->oper.read;
-	cache_oper->write       = oper->oper.write;
-	cache_oper->flush       = oper->oper.flush;
-	cache_oper->release     = oper->oper.release;
-	cache_oper->fsync       = oper->oper.fsync;
-	cache_oper->statfs      = oper->oper.statfs;
-	cache_oper->setxattr    = oper->oper.setxattr;
-	cache_oper->getxattr    = oper->oper.getxattr;
-	cache_oper->listxattr   = oper->oper.listxattr;
-	cache_oper->removexattr = oper->oper.removexattr;
-#if FUSE_VERSION >= 25
-	cache_oper->create      = oper->oper.create;
-	cache_oper->ftruncate   = oper->oper.ftruncate;
-	cache_oper->fgetattr    = oper->oper.fgetattr;
-#endif
-#if FUSE_VERSION >= 29
-	cache_oper->flag_nullpath_ok = oper->oper.flag_nullpath_ok;
-	cache_oper->flag_nopath  = oper->oper.flag_nopath;
-#endif
-}
-
-static void cache_fill(struct fuse_cache_operations *oper,
+static void cache_fill(struct fuse_operations *oper,
 		       struct fuse_operations *cache_oper)
 {
-	cache_oper->getattr  = oper->oper.getattr ? cache_getattr : NULL;
-	cache_oper->readlink = oper->oper.readlink ? cache_readlink : NULL;
-	cache_oper->getdir   = oper->cache_getdir ? cache_getdir : NULL;
-	cache_oper->mknod    = oper->oper.mknod ? cache_mknod : NULL;
-	cache_oper->mkdir    = oper->oper.mkdir ? cache_mkdir : NULL;
-	cache_oper->symlink  = oper->oper.symlink ? cache_symlink : NULL;
-	cache_oper->unlink   = oper->oper.unlink ? cache_unlink : NULL;
-	cache_oper->rmdir    = oper->oper.rmdir ? cache_rmdir : NULL;
-	cache_oper->rename   = oper->oper.rename ? cache_rename : NULL;
-	cache_oper->link     = oper->oper.link ? cache_link : NULL;
-	cache_oper->chmod    = oper->oper.chmod ? cache_chmod : NULL;
-	cache_oper->chown    = oper->oper.chown ? cache_chown : NULL;
-	cache_oper->truncate = oper->oper.truncate ? cache_truncate : NULL;
-	cache_oper->utime    = oper->oper.utime ? cache_utime : NULL;
-	cache_oper->write    = oper->oper.write ? cache_write : NULL;
-#if FUSE_VERSION >= 25
-	cache_oper->create   = oper->oper.create ? cache_create : NULL;
-	cache_oper->ftruncate = oper->oper.ftruncate ? cache_ftruncate : NULL;
-	cache_oper->fgetattr = oper->oper.fgetattr ? cache_fgetattr : NULL;
-#endif
-#if FUSE_VERSION >= 29
-	cache_oper->flag_nullpath_ok = 0;
-	cache_oper->flag_nopath = 0;
-#endif
-
+	cache_oper->access   = oper->access;
+	cache_oper->chmod    = oper->chmod ? cache_chmod : NULL;
+	cache_oper->chown    = oper->chown ? cache_chown : NULL;
+	cache_oper->create   = oper->create ? cache_create : NULL;
+	cache_oper->flush    = oper->flush;
+	cache_oper->fsync    = oper->fsync;
+	cache_oper->getattr  = oper->getattr ? cache_getattr : NULL;
+	cache_oper->getxattr = oper->getxattr;
+	cache_oper->init     = cache_init;
+	cache_oper->link     = oper->link ? cache_link : NULL;
+	cache_oper->listxattr = oper->listxattr;
+	cache_oper->mkdir    = oper->mkdir ? cache_mkdir : NULL;
+	cache_oper->mknod    = oper->mknod ? cache_mknod : NULL;
+	cache_oper->open     = oper->open;
+	cache_oper->opendir  = cache_opendir;
+	cache_oper->read     = oper->read;
+	cache_oper->readdir  = oper->readdir ? cache_readdir : NULL;
+	cache_oper->readlink = oper->readlink ? cache_readlink : NULL;
+	cache_oper->release  = oper->release;
+	cache_oper->releasedir = cache_releasedir;
+	cache_oper->removexattr = oper->removexattr;
+	cache_oper->rename   = oper->rename ? cache_rename : NULL;
+	cache_oper->rmdir    = oper->rmdir ? cache_rmdir : NULL;
+	cache_oper->setxattr = oper->setxattr;
+	cache_oper->statfs   = oper->statfs;
+	cache_oper->symlink  = oper->symlink ? cache_symlink : NULL;
+	cache_oper->truncate = oper->truncate ? cache_truncate : NULL;
+	cache_oper->unlink   = oper->unlink ? cache_unlink : NULL;
+	cache_oper->utimens  = oper->utimens ? cache_utimens : NULL;
+	cache_oper->write    = oper->write ? cache_write : NULL;
 }
 
-struct fuse_operations *cache_init(struct fuse_cache_operations *oper)
+struct fuse_operations *cache_wrap(struct fuse_operations *oper)
 {
 	static struct fuse_operations cache_oper;
 	cache.next_oper = oper;
 
-	cache_unity_fill(oper, &cache_oper);
-	if (cache.on) {
-		cache_fill(oper, &cache_oper);
-		pthread_mutex_init(&cache.lock, NULL);
-		cache.table = g_hash_table_new_full(g_str_hash, g_str_equal,
-						    g_free, free_node);
-		if (cache.table == NULL) {
-			fprintf(stderr, "failed to create cache\n");
-			return NULL;
-		}
+	cache_fill(oper, &cache_oper);
+	pthread_mutex_init(&cache.lock, NULL);
+	cache.table = g_hash_table_new_full(g_str_hash, g_str_equal,
+					    g_free, free_node);
+	if (cache.table == NULL) {
+		fprintf(stderr, "failed to create cache\n");
+		return NULL;
 	}
 	return &cache_oper;
 }
 
 static const struct fuse_opt cache_opts[] = {
-	{ "cache=yes", offsetof(struct cache, on), 1 },
-	{ "cache=no", offsetof(struct cache, on), 0 },
+	{ "dcache_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
+	{ "dcache_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
+	{ "dcache_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
+	{ "dcache_stat_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
+	{ "dcache_dir_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
+	{ "dcache_link_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
+	{ "dcache_max_size=%u", offsetof(struct cache, max_size), 0 },
+	{ "dcache_clean_interval=%u", offsetof(struct cache,
+					       clean_interval_secs), 0 },
+	{ "dcache_min_clean_interval=%u", offsetof(struct cache,
+						   min_clean_interval_secs), 0 },
+
+	/* For backwards compatibility */
 	{ "cache_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
 	{ "cache_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
 	{ "cache_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
@@ -589,9 +596,9 @@ static const struct fuse_opt cache_opts[] = {
 	{ "cache_link_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
 	{ "cache_max_size=%u", offsetof(struct cache, max_size), 0 },
 	{ "cache_clean_interval=%u", offsetof(struct cache,
-	                                      clean_interval_secs), 0 },
+					       clean_interval_secs), 0 },
 	{ "cache_min_clean_interval=%u", offsetof(struct cache,
-	                                          min_clean_interval_secs), 0 },
+						   min_clean_interval_secs), 0 },
 	FUSE_OPT_END
 };
 
@@ -603,7 +610,6 @@ int cache_parse_options(struct fuse_args *args)
 	cache.max_size = DEFAULT_MAX_CACHE_SIZE;
 	cache.clean_interval_secs = DEFAULT_CACHE_CLEAN_INTERVAL_SECS;
 	cache.min_clean_interval_secs = DEFAULT_MIN_CACHE_CLEAN_INTERVAL_SECS;
-	cache.on = 1;
 
 	return fuse_opt_parse(args, &cache, cache_opts, NULL);
 }

cache.h

@@ -9,20 +9,7 @@
 #include <fuse.h>
 #include <fuse_opt.h>
 
-#ifndef FUSE_VERSION
-#define FUSE_VERSION (FUSE_MAJOR_VERSION * 10 + FUSE_MINOR_VERSION)
-#endif
-
-typedef struct fuse_cache_dirhandle *fuse_cache_dirh_t;
-typedef int (*fuse_cache_dirfil_t) (fuse_cache_dirh_t h, const char *name,
-                                    const struct stat *stbuf);
-
-struct fuse_cache_operations {
-    struct fuse_operations oper;
-    int (*cache_getdir) (const char *, fuse_cache_dirh_t, fuse_cache_dirfil_t);
-};
-
-struct fuse_operations *cache_init(struct fuse_cache_operations *oper);
+struct fuse_operations *cache_wrap(struct fuse_operations *oper);
 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);

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(sshfs, 2.10)
+AC_INIT(sshfs, 3.2.0)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -17,7 +17,7 @@ case "$target_os" in
 esac
 
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-PKG_CHECK_MODULES([SSHFS], [fuse >= 2.3 glib-2.0 gthread-2.0])
+PKG_CHECK_MODULES([SSHFS], [fuse3 >= 3.1 glib-2.0 gthread-2.0])
 have_fuse_opt_parse=no
 oldlibs="$LIBS"
 LIBS="$LIBS $SSHFS_LIBS"

meson.build

@@ -1,4 +1,4 @@
-project('sshfs', 'c', version: '2.10.0',
+project('sshfs', 'c', version: '3.1.0',
         meson_version: '>= 0.38',
         default_options: [ 'buildtype=plain' ])
 
@@ -45,14 +45,14 @@ configure_file(input: 'sshfs.1.in',
 configure_file(output: 'config.h',
                configuration : cfg)
 
-sshfs_deps = [ dependency('fuse', version: '>= 2.3'),
+sshfs_deps = [ dependency('fuse3', version: '>= 3.1.0'),
                dependency('glib-2.0'),
                dependency('gthread-2.0') ]
 
 executable('sshfs', sshfs_sources,
            include_directories: include_dirs,
            dependencies: sshfs_deps,
-           c_args: ['-DFUSE_USE_VERSION=26'],
+           c_args: ['-DFUSE_USE_VERSION=31'],
            install: true,
            install_dir: get_option('bindir'))
 

sshfs.1.in

@@ -64,15 +64,6 @@ synchronous readdir
 \fB\-o\fR sshfs_debug
 print some debugging information
 .TP
-\fB\-o\fR cache=BOOL
-enable caching {yes,no} (default: yes)
-.TP
-\fB\-o\fR cache_timeout=N
-sets timeout for caches in seconds (default: 20)
-.TP
-\fB\-o\fR cache_X_timeout=N
-sets timeout for {stat,dir,link} cache
-.TP
 \fB\-o\fR workaround=LIST
 colon separated list of workarounds
 .RS 8
@@ -80,9 +71,6 @@ colon separated list of workarounds
 none
 no workarounds enabled
 .TP
-all
-all workarounds enabled
-.TP
 [no]rename
 fix renaming to existing file (default: off)
 .TP
@@ -180,9 +168,6 @@ allow access to other users
 .TP
 \fB\-o\fR allow_root
 allow access to root
-.TP
-\fB\-o\fR nonempty
-allow mounts over non\-empty file/dir
 .HP
 \fB\-o\fR default_permissions
 enable permission checking by kernel
@@ -193,24 +178,9 @@ set filesystem name
 \fB\-o\fR subtype=NAME
 set filesystem type
 .TP
-\fB\-o\fR large_read
-issue large read requests (2.4 only)
-.TP
 \fB\-o\fR max_read=N
 set maximum size of read requests
 .TP
-\fB\-o\fR hard_remove
-immediate removal (don't hide files)
-.TP
-\fB\-o\fR use_ino
-let filesystem set inode numbers
-.TP
-\fB\-o\fR readdir_ino
-try to fill in d_ino in readdir
-.TP
-\fB\-o\fR direct_io
-use direct I/O
-.TP
 \fB\-o\fR kernel_cache
 cache files in kernel
 .TP
@@ -238,26 +208,11 @@ cache timeout for attributes (1.0s)
 \fB\-o\fR ac_attr_timeout=T
 auto cache timeout for attributes (attr_timeout)
 .TP
-\fB\-o\fR intr
-allow requests to be interrupted
-.TP
-\fB\-o\fR intr_signal=NUM
-signal to send on interrupt (10)
-.TP
 \fB\-o\fR modules=M1[:M2...]
 names of modules to push onto filesystem stack
 .TP
 \fB\-o\fR max_write=N
 set maximum size of write requests
-.TP
-\fB\-o\fR max_readahead=N
-set maximum readahead
-.TP
-\fB\-o\fR async_read
-perform reads asynchronously (default)
-.TP
-\fB\-o\fR sync_read
-perform reads synchronously
 .SS "Module options:"
 .TP
 [subdir]

test/meson.build

@@ -2,7 +2,7 @@ test_scripts = [ 'conftest.py', 'pytest.ini', 'test_sshfs.py',
                  'util.py' ]
 custom_target('test_scripts', input: test_scripts,
               output: test_scripts, build_by_default: true,
-              command: ['cp', '-fPu', '--preserve=mode',
+              command: ['cp', '-fP', '--preserve=mode',
                         '@INPUT@', meson.current_build_dir() ])
 
 # Provide something helpful when running 'ninja test'

test/test_sshfs.py

@@ -13,6 +13,7 @@ import stat
 import shutil
 import filecmp
 import errno
+from contextlib import contextmanager
 from tempfile import NamedTemporaryFile
 from util import (wait_for_mount, umount, cleanup, base_cmdline,
                   basename, fuse_test_marker, safe_sleep)
@@ -30,8 +31,11 @@ def name_generator(__ctr=[0]):
     return 'testfile_%d' % __ctr[0]
 
 @pytest.mark.parametrize("debug", (False, True))
-@pytest.mark.parametrize("cache_timeout", (0, 1))
-def test_sshfs(tmpdir, debug, cache_timeout, capfd):
+@pytest.mark.parametrize("cache_timeout", (0,1))
+@pytest.mark.parametrize("sync_rd", (True, False))
+@pytest.mark.parametrize("writeback", (False, True))
+def test_sshfs(tmpdir, debug, cache_timeout, sync_rd,
+               writeback, capfd):
     
     # Avoid false positives from debug messages
     #if debug:
@@ -58,11 +62,21 @@ def test_sshfs(tmpdir, debug, cache_timeout, capfd):
     if debug:
         cmdline += [ '-o', 'sshfs_debug' ]
 
+    if sync_rd:
+        cmdline += [ '-o', 'sync_readdir' ]
+
+    if writeback:
+        cmdline += [ '-o', 'writeback_cache=yes',
+                     '-o', 'unreliable_append' ]
+    else:
+        cmdline += [ '-o', 'writeback_cache=no' ]
+    
     # SSHFS Cache
     if cache_timeout == 0:
-        cmdline += [ '-o', 'cache=no' ]
+        cmdline += [ '-o', 'dir_cache=no' ]
     else:
-        cmdline += [ '-o', 'cache_timeout=%d' % cache_timeout ]
+        cmdline += [ '-o', 'dcache_timeout=%d' % cache_timeout,
+                     '-o', 'dir_cache=yes' ]
 
     # FUSE Cache
     cmdline += [ '-o', 'entry_timeout=0',
@@ -82,6 +96,8 @@ def test_sshfs(tmpdir, debug, cache_timeout, capfd):
         tst_readdir(src_dir, mnt_dir)
         tst_open_read(src_dir, mnt_dir)
         tst_open_write(src_dir, mnt_dir)
+        tst_append(src_dir, mnt_dir)
+        tst_seek(src_dir, mnt_dir)
         tst_create(mnt_dir)
         tst_passthrough(src_dir, mnt_dir, cache_timeout)
         tst_mkdir(mnt_dir)
@@ -105,6 +121,17 @@ def test_sshfs(tmpdir, debug, cache_timeout, capfd):
     else:
         umount(mount_process, mnt_dir)
 
+@contextmanager
+def os_open(name, flags):
+    fd = os.open(name, flags)
+    try:
+        yield fd
+    finally:
+        os.close(fd)
+
+def os_create(name):
+    os.close(os.open(name, os.O_CREAT | os.O_RDWR))
+
 def tst_unlink(src_dir, mnt_dir, cache_timeout):
     name = name_generator()
     fullname = mnt_dir + "/" + name
@@ -210,6 +237,32 @@ def tst_open_write(src_dir, mnt_dir):
 
     assert filecmp.cmp(fullname, TEST_FILE, False)
 
+def tst_append(src_dir, mnt_dir):
+    name = name_generator()
+    os_create(pjoin(src_dir, name))
+    fullname = pjoin(mnt_dir, name)
+    with os_open(fullname, os.O_WRONLY) as fd:
+        os.write(fd, b'foo\n')
+    with os_open(fullname, os.O_WRONLY|os.O_APPEND) as fd:
+        os.write(fd, b'bar\n')
+
+    with open(fullname, 'rb') as fh:
+        assert fh.read() == b'foo\nbar\n'
+
+def tst_seek(src_dir, mnt_dir):
+    name = name_generator()
+    os_create(pjoin(src_dir, name))
+    fullname = pjoin(mnt_dir, name)
+    with os_open(fullname, os.O_WRONLY) as fd:
+        os.lseek(fd, 1, os.SEEK_SET)
+        os.write(fd, b'foobar\n')
+    with os_open(fullname, os.O_WRONLY) as fd:
+        os.lseek(fd, 4, os.SEEK_SET)
+        os.write(fd, b'com')
+
+    with open(fullname, 'rb') as fh:
+        assert fh.read() == b'\0foocom\n'
+
 def tst_open_unlink(mnt_dir):
     name = pjoin(mnt_dir, name_generator())
     data1 = b'foo'

test/travis-install.sh

@@ -13,9 +13,23 @@ valgrind --version
 ninja --version
 meson --version
 
+# Install fuse
+wget https://github.com/libfuse/libfuse/archive/master.zip
+unzip master.zip
+cd libfuse-master
+mkdir build
+cd build
+export CC=gcc-6
+meson ..
+ninja
+sudo ninja install
+test -e /usr/local/lib/pkgconfig || sudo mkdir /usr/local/lib/pkgconfig
+sudo mv /usr/local/lib/*/pkgconfig/* /usr/local/lib/pkgconfig/
+ls -d1 /usr/local/lib/*-linux-gnu | sudo tee /etc/ld.so.conf.d/usrlocal.conf
+sudo ldconfig
+
 # Setup ssh
 ssh-keygen -b 768 -t rsa -f ~/.ssh/id_rsa -P ''
 cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 chmod 600 ~/.ssh/authorized_keys
 ssh -o "StrictHostKeyChecking=no" localhost echo "SSH connection succeeded"
-