1 files changed, 12 insertions, 43 deletions

diff --git a/exfat/exfat-fuse/main.c b/exfat/exfat-fuse/main.c
index 30ea4bcb2..abb60e7df 100644
--- a/exfat/exfat-fuse/main.c
+++ b/exfat/exfat-fuse/main.c
@@ -3,7 +3,7 @@
 	FUSE-based exFAT implementation. Requires FUSE 2.6 or later.
 
 	Free exFAT implementation.
-	Copyright (C) 2010-2014  Andrew Nayenko
+	Copyright (C) 2010-2013  Andrew Nayenko
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -83,13 +83,6 @@ static int fuse_exfat_truncate(const char* path, off64_t size)
 		return rc;
 
 	rc = exfat_truncate(&ef, node, size, true);
-	if (rc != 0)
-	{
-		exfat_flush_node(&ef, node);	/* ignore return code */
-		exfat_put_node(&ef, node);
-		return rc;
-	}
-	rc = exfat_flush_node(&ef, node);
 	exfat_put_node(&ef, node);
 	return rc;
 }
@@ -111,7 +104,7 @@ static int fuse_exfat_readdir(const char* path, void* buffer,
 	if (!(parent->flags & EXFAT_ATTRIB_DIR))
 	{
 		exfat_put_node(&ef, parent);
-		exfat_error("'%s' is not a directory (0x%x)", path, parent->flags);
+		exfat_error("`%s' is not a directory (0x%x)", path, parent->flags);
 		return -ENOTDIR;
 	}
 
@@ -122,7 +115,7 @@ static int fuse_exfat_readdir(const char* path, void* buffer,
 	if (rc != 0)
 	{
 		exfat_put_node(&ef, parent);
-		exfat_error("failed to open directory '%s'", path);
+		exfat_error("failed to open directory `%s'", path);
 		return rc;
 	}
 	while ((node = exfat_readdir(&ef, &it)))
@@ -156,28 +149,9 @@ static int fuse_exfat_open(const char* path, struct fuse_file_info* fi)
 
 static int fuse_exfat_release(const char* path, struct fuse_file_info* fi)
 {
-	/*
-	   This handler is called by FUSE on close() syscall. If the FUSE
-	   implementation does not call flush handler, we will flush node here.
-	   But in this case we will not be able to return an error to the caller.
-	   See fuse_exfat_flush() below.
-	*/
 	exfat_debug("[%s] %s", __func__, path);
- 	exfat_flush_node(&ef, get_node(fi));
 	exfat_put_node(&ef, get_node(fi));
-	return 0; /* FUSE ignores this return value */
-}
-
-static int fuse_exfat_flush(const char* path, struct fuse_file_info* fi)
-{
-	/*
-	   This handler may be called by FUSE on close() syscall. FUSE also deals
-	   with removals of open files, so we don't free clusters on close but
-	   only on rmdir and unlink. If the FUSE implementation does not call this
-	   handler we will flush node on release. See fuse_exfat_relase() above.
-	*/
-	exfat_debug("[%s] %s", __func__, path);
-	return exfat_flush_node(&ef, get_node(fi));
+	return 0;
 }
 
 static int fuse_exfat_fsync(const char* path, int datasync,
@@ -186,6 +160,9 @@ static int fuse_exfat_fsync(const char* path, int datasync,
 	int rc;
 
 	exfat_debug("[%s] %s", __func__, path);
+	rc = exfat_flush_node(&ef, get_node(fi));
+	if (rc != 0)
+		return rc;
 	rc = exfat_flush(&ef);
 	if (rc != 0)
 		return rc;
@@ -229,9 +206,7 @@ static int fuse_exfat_unlink(const char* path)
 
 	rc = exfat_unlink(&ef, node);
 	exfat_put_node(&ef, node);
-	if (rc != 0)
-		return rc;
-	return exfat_cleanup_node(&ef, node);
+	return rc;
 }
 
 static int fuse_exfat_rmdir(const char* path)
@@ -247,9 +222,7 @@ static int fuse_exfat_rmdir(const char* path)
 
 	rc = exfat_rmdir(&ef, node);
 	exfat_put_node(&ef, node);
-	if (rc != 0)
-		return rc;
-	return exfat_cleanup_node(&ef, node);
+	return rc;
 }
 
 static int fuse_exfat_mknod(const char* path, mode_t mode, dev_t dev)
@@ -282,9 +255,8 @@ static int fuse_exfat_utimens(const char* path, const struct timespec tv[2])
 		return rc;
 
 	exfat_utimes(node, tv);
-	rc = exfat_flush_node(&ef, node);
 	exfat_put_node(&ef, node);
-	return rc;
+	return 0;
 }
 
 static int fuse_exfat_chmod(const char* path, mode_t mode)
@@ -323,7 +295,7 @@ static int fuse_exfat_statfs(const char* path, struct statvfs* sfs)
 	   b) no such thing as inode;
 	   So here we assume that inode = cluster.
 	*/
-	sfs->f_files = le32_to_cpu(ef.sb->cluster_count);
+	sfs->f_files = (sfs->f_blocks - sfs->f_bfree) >> ef.sb->spc_bits;
 	sfs->f_favail = sfs->f_bfree >> ef.sb->spc_bits;
 	sfs->f_ffree = sfs->f_bavail;
 
@@ -358,7 +330,6 @@ static struct fuse_operations fuse_exfat_ops =
 	.readdir	= fuse_exfat_readdir,
 	.open		= fuse_exfat_open,
 	.release	= fuse_exfat_release,
-	.flush		= fuse_exfat_flush,
 	.fsync		= fuse_exfat_fsync,
 	.fsyncdir	= fuse_exfat_fsync,
 	.read		= fuse_exfat_read,
@@ -379,7 +350,6 @@ static struct fuse_operations fuse_exfat_ops =
 static char* add_option(char* options, const char* name, const char* value)
 {
 	size_t size;
-	char* optionsf = options;
 
 	if (value)
 		size = strlen(options) + strlen(name) + strlen(value) + 3;
@@ -389,7 +359,6 @@ static char* add_option(char* options, const char* name, const char* value)
 	options = realloc(options, size);
 	if (options == NULL)
 	{
-		free(optionsf);
 		exfat_error("failed to reallocate options string");
 		return NULL;
 	}
@@ -485,7 +454,7 @@ int main(int argc, char* argv[])
 			break;
 		case 'V':
 			free(mount_options);
-			puts("Copyright (C) 2010-2014  Andrew Nayenko");
+			puts("Copyright (C) 2010-2013  Andrew Nayenko");
 			return 0;
 		case 'v':
 			break;