Released 2.1

ChangeLog

@@ -1,3 +1,31 @@
+2008-07-11  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Released 2.1
+
+2008-07-11  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Fix statvfs extension to match the current protocol in
+	opensshfs
+
+	* Check version numbers of extensions, so such changes wouldn't
+	cause stupid behavior
+
+2008-06-24  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Add '-F' option to specify the ssh config file.  Patch by Pat
+	Pascal.
+
+2008-05-06  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Fix bug in caching which could cause file corruption for append
+	mode writes.  Reported by Jose Alonso
+
+2008-05-05  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Fix compile on OS X.  Original patch from Michael G Schwern
+
+	* Fix compile on Solaris.  Reported by Jean-Jacques Sarton
+
 2008-04-23  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Released 2.0

cache.c

@@ -28,6 +28,7 @@ struct cache {
 	GHashTable *table;
 	pthread_mutex_t lock;
 	time_t last_cleaned;
+	uint64_t write_ctr;
 };
 
 static struct cache cache;
@@ -47,6 +48,7 @@ struct fuse_cache_dirhandle {
 	fuse_dirh_t h;
 	fuse_dirfil_t filler;
 	GPtrArray *dir;
+	uint64_t wrctr;
 };
 
 static void free_node(gpointer node_)
@@ -108,6 +110,14 @@ void cache_invalidate(const char *path)
 	pthread_mutex_unlock(&cache.lock);
 }
 
+void cache_invalidate_write(const char *path)
+{
+	pthread_mutex_lock(&cache.lock);
+	cache_purge(path);
+	cache.write_ctr++;
+	pthread_mutex_unlock(&cache.lock);
+}
+
 static void cache_invalidate_dir(const char *path)
 {
 	pthread_mutex_lock(&cache.lock);
@@ -148,19 +158,21 @@ static struct node *cache_get(const char *path)
 	return node;
 }
 
-void cache_add_attr(const char *path, const struct stat *stbuf)
+void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
 {
 	struct node *node;
 	time_t now;
 
 	pthread_mutex_lock(&cache.lock);
-	node = cache_get(path);
-	now = time(NULL);
-	node->stat = *stbuf;
-	node->stat_valid = time(NULL) + cache.stat_timeout;
-	if (node->stat_valid > node->valid)
-		node->valid = node->stat_valid;
-	cache_clean();
+	if (wrctr == cache.write_ctr) {
+		node = cache_get(path);
+		now = time(NULL);
+		node->stat = *stbuf;
+		node->stat_valid = time(NULL) + cache.stat_timeout;
+		if (node->stat_valid > node->valid)
+			node->valid = node->stat_valid;
+		cache_clean();
+	}
 	pthread_mutex_unlock(&cache.lock);
 }
 
@@ -222,13 +234,25 @@ static int cache_get_attr(const char *path, struct stat *stbuf)
 	return err;
 }
 
+uint64_t cache_get_write_ctr(void)
+{
+	uint64_t res;
+
+	pthread_mutex_lock(&cache.lock);
+	res = cache.write_ctr;
+	pthread_mutex_unlock(&cache.lock);
+
+	return res;
+}
+
 static int cache_getattr(const char *path, struct stat *stbuf)
 {
 	int err = cache_get_attr(path, stbuf);
 	if (err) {
+		uint64_t wrctr = cache_get_write_ctr();
 		err = cache.next_oper->oper.getattr(path, stbuf);
 		if (!err)
-			cache_add_attr(path, stbuf);
+			cache_add_attr(path, stbuf, wrctr);
 	}
 	return err;
 }
@@ -268,7 +292,7 @@ static int cache_dirfill(fuse_cache_dirh_t ch, const char *name,
 			const char *basepath = !ch->path[1] ? "" : ch->path;
 
 			fullpath = g_strdup_printf("%s/%s", basepath, name);
-			cache_add_attr(fullpath, stbuf);
+			cache_add_attr(fullpath, stbuf, ch->wrctr);
 			g_free(fullpath);
 		}
 	}
@@ -299,6 +323,7 @@ static int cache_getdir(const char *path, fuse_dirh_t h, fuse_dirfil_t filler)
 	ch.h = h;
 	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);
 	g_ptr_array_add(ch.dir, NULL);
 	dir = (char **) ch.dir->pdata;
@@ -421,7 +446,7 @@ static int cache_write(const char *path, const char *buf, size_t size,
 {
 	int res = cache.next_oper->oper.write(path, buf, size, offset, fi);
 	if (res >= 0)
-		cache_invalidate(path);
+		cache_invalidate_write(path);
 	return res;
 }
 
@@ -449,9 +474,10 @@ static int cache_fgetattr(const char *path, struct stat *stbuf,
 {
 	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);
+			cache_add_attr(path, stbuf, wrctr);
 	}
 	return err;
 }

cache.h

@@ -24,5 +24,6 @@ struct fuse_cache_operations {
 
 struct fuse_operations *cache_init(struct fuse_cache_operations *oper);
 int cache_parse_options(struct fuse_args *args);
-void cache_add_attr(const char *path, const struct stat *stbuf);
+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);

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(sshfs-fuse, 2.0)
+AC_INIT(sshfs-fuse, 2.1)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 

sshfs.1

@@ -1,8 +1,24 @@
 .TH SSHFS "1" "April 2008" "SSHFS version 2.0" "User Commands"
 .SH NAME
 SSHFS \- filesystem client based on ssh
+.SH SYNOPSIS
+.SS mounting
+.TP
+\fBsshfs\fP [\fIuser\fP@]\fBhost\fP:[\fIdir\fP] \fBmountpoint\fP [\fIoptions\fP]
+.SS unmounting
+.TP
+\fBfusermount -u mountpoint\fP
 .SH DESCRIPTION
-usage: sshfs [user@]host:[dir] mountpoint [options]
+SSHFS (Secure SHell FileSystem) is a file system for Linux (and other
+operating systems with a FUSE implementation, such as Mac OS X or FreeBSD)
+capable of operating on files on a remote computer using just a secure
+shell login on the remote computer. On the local computer where the SSHFS
+is mounted, the implementation makes use of the FUSE (Filesystem in
+Userspace) kernel module. The practical effect of this is that the end user
+can seamlessly interact with remote files being securely served over SSH
+just as if they were local files on his/her computer. On the remote
+computer the SFTP subsystem of SSH is used.
+.SH OPTIONS
 .SS "general options:"
 .TP
 \fB\-o\fR opt,[opt...]
@@ -21,6 +37,9 @@ equivalent to '\-o port=PORT'
 \fB\-C\fR
 equivalent to '\-o compression=yes'
 .TP
+\fB\-F\fR ssh_configfile
+specifies alternative ssh configuration file
+.TP
 \fB\-1\fR
 equivalent to '\-o ssh_protocol=1'
 .TP
@@ -47,6 +66,7 @@ sets timeout for {stat,dir,link} cache
 .TP
 \fB\-o\fR workaround=LIST
 colon separated list of workarounds
+.RS 8
 .TP
 none
 no workarounds enabled
@@ -65,15 +85,18 @@ fix truncate for old servers (default: off)
 .TP
 [no]buflimit
 fix buffer fillup bug in server (default: on)
+.RE
 .TP
 \fB\-o\fR idmap=TYPE
 user/group ID mapping, possible types are:
+.RS 8
 .TP
 none
 no translation of the ID space (default)
 .TP
 user
 only translate UID of connecting user
+.RE
 .TP
 \fB\-o\fR ssh_command=CMD
 execute CMD instead of 'ssh'
@@ -212,3 +235,12 @@ original encoding of file names (default: UTF-8)
 .TP
 \fB\-o\fR to_code=CHARSET
 new encoding of the file names (default: ISO-8859-2)
+.PD
+.SH "AUTHORS"
+.LP
+SSHFS has been written by Miklos Seredi <miklos@szeredi.hu>.
+.LP
+This man page was written by Bartosz Fenski <fenio@debian.org> for the
+Debian GNU/Linux distribution (but it may be used by others).
+
+

sshfs.c

@@ -24,6 +24,7 @@
 #include <netdb.h>
 #include <signal.h>
 #include <sys/uio.h>
+#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -36,6 +37,15 @@
 
 #include "cache.h"
 
+#ifndef MAP_LOCKED
+#define MAP_LOCKED 0
+#endif
+
+#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+
 #if FUSE_VERSION >= 23
 #define SSHFS_USE_INIT
 #endif
@@ -278,6 +288,7 @@ enum {
 	KEY_HELP,
 	KEY_VERSION,
 	KEY_FOREGROUND,
+	KEY_CONFIGFILE,
 };
 
 #define SSHFS_OPT(t, p, v) { t, offsetof(struct sshfs, p), v }
@@ -311,6 +322,7 @@ static struct fuse_opt sshfs_opts[] = {
 	FUSE_OPT_KEY("debug",          KEY_FOREGROUND),
 	FUSE_OPT_KEY("-d",             KEY_FOREGROUND),
 	FUSE_OPT_KEY("-f",             KEY_FOREGROUND),
+	FUSE_OPT_KEY("-F ",            KEY_CONFIGFILE),
 	FUSE_OPT_END
 };
 
@@ -650,29 +662,29 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
 
 static int buf_get_statvfs(struct buffer *buf, struct statvfs *stbuf)
 {
-	uint32_t bsize;
-	uint32_t frsize;
+	uint64_t bsize;
+	uint64_t frsize;
 	uint64_t blocks;
 	uint64_t bfree;
 	uint64_t bavail;
 	uint64_t files;
 	uint64_t ffree;
 	uint64_t favail;
-	uint32_t fsid;
-	uint32_t flag;
-	uint32_t namemax;
+	uint64_t fsid;
+	uint64_t flag;
+	uint64_t namemax;
 
-	if (buf_get_uint32(buf, &bsize) == -1 ||
-	    buf_get_uint32(buf, &frsize) == -1 ||
+	if (buf_get_uint64(buf, &bsize) == -1 ||
+	    buf_get_uint64(buf, &frsize) == -1 ||
 	    buf_get_uint64(buf, &blocks) == -1 ||
 	    buf_get_uint64(buf, &bfree) == -1 ||
 	    buf_get_uint64(buf, &bavail) == -1 ||
 	    buf_get_uint64(buf, &files) == -1 ||
 	    buf_get_uint64(buf, &ffree) == -1 ||
 	    buf_get_uint64(buf, &favail) == -1 ||
-	    buf_get_uint32(buf, &fsid) == -1 ||
-	    buf_get_uint32(buf, &flag) == -1 ||
-	    buf_get_uint32(buf, &namemax) == -1) {
+	    buf_get_uint64(buf, &fsid) == -1 ||
+	    buf_get_uint64(buf, &flag) == -1 ||
+	    buf_get_uint64(buf, &namemax) == -1) {
 		return -1;
 	}
 
@@ -1338,11 +1350,13 @@ static int sftp_init_reply_ok(struct buffer *buf, uint32_t *version)
 
 			DEBUG("Extension: %s <%s>\n", ext, extdata);
 
-			if (strcmp(ext, SFTP_EXT_POSIX_RENAME) == 0) {
+			if (strcmp(ext, SFTP_EXT_POSIX_RENAME) == 0 &&
+			    strcmp(extdata, "1") == 0) {
 				sshfs.ext_posix_rename = 1;
 				sshfs.rename_workaround = 0;
 			}
-			if (strcmp(ext, SFTP_EXT_STATVFS) == 0)
+			if (strcmp(ext, SFTP_EXT_STATVFS) == 0 &&
+			    strcmp(extdata, "2") == 0)
 				sshfs.ext_statvfs = 1;
 		} while (buf2.len < buf2.size);
 	}
@@ -2116,6 +2130,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
 	uint32_t pflags = 0;
 	struct iovec iov;
 	uint8_t type;
+	uint64_t wrctr = cache_get_write_ctr();
 
 	if ((fi->flags & O_ACCMODE) == O_RDONLY)
 		pflags = SSH_FXF_READ;
@@ -2171,7 +2186,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
 	}
 
 	if (!err) {
-		cache_add_attr(path, &stbuf);
+		cache_add_attr(path, &stbuf, wrctr);
 		buf_finish(&sf->handle);
 		fi->fh = (unsigned long) sf;
 	} else {
@@ -2823,6 +2838,7 @@ static void usage(const char *progname)
 "SSHFS options:\n"
 "    -p PORT                equivalent to '-o port=PORT'\n"
 "    -C                     equivalent to '-o compression=yes'\n"
+"    -F ssh_configfile      specifies alternative ssh configuration file\n"
 "    -1                     equivalent to '-o ssh_protocol=1'\n"
 "    -o reconnect           reconnect to server\n"
 "    -o sshfs_sync          synchronous writes\n"
@@ -2913,6 +2929,12 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
 		ssh_add_arg("-oCompression=yes");
 		return 0;
 
+	case KEY_CONFIGFILE:
+		tmp = g_strdup_printf("-F%s", arg + 2);
+		ssh_add_arg(tmp);
+		g_free(tmp);
+		return 0;
+
 	case KEY_HELP:
 		usage(outargs->argv[0]);
 		fuse_opt_add_arg(outargs, "-ho");