aboutsummaryrefslogtreecommitdiff
path: root/sshfs.c
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2008-05-06 15:10:28 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2008-05-06 15:10:28 +0000
commit4b28b15c34f0969e47fbbfd81c4f63e6e6f16203 (patch)
tree85a493815cd22d9d41866081c1b0e2ec1e937386 /sshfs.c
parent1a76a16bd97f01c0bfcc022c1c317f6e5fad5a6e (diff)
downloadsshfs-4b28b15c34f0969e47fbbfd81c4f63e6e6f16203.tar
sshfs-4b28b15c34f0969e47fbbfd81c4f63e6e6f16203.tar.gz
sshfs-4b28b15c34f0969e47fbbfd81c4f63e6e6f16203.tar.bz2
sshfs-4b28b15c34f0969e47fbbfd81c4f63e6e6f16203.zip
Fix bug in caching which could cause file corruption for append mode writes
Diffstat (limited to 'sshfs.c')
-rw-r--r--sshfs.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/sshfs.c b/sshfs.c
index 39eec48..6f5c256 100644
--- a/sshfs.c
+++ b/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
@@ -2116,6 +2126,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 +2182,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 {