aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2003-12-15 12:11:33 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2003-12-15 12:11:33 +0000
commit2f3d940b2e5fa1c6c0b44372bd3372a20ccc71ab (patch)
treea1eedee59b49babdec8d10389e360eb60de04a8e
parent7a19cafc5d0fb8786a61fdadba1a6014a0396e5f (diff)
downloadlibfuse-2f3d940b2e5fa1c6c0b44372bd3372a20ccc71ab.tar.gz
version numbers added
-rw-r--r--ChangeLog5
-rw-r--r--example/fusexmp.c18
-rw-r--r--include/fuse.h6
-rw-r--r--include/linux/fuse.h3
-rw-r--r--lib/fuse.c11
5 files changed, 27 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index a6dcc37..455e599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15 Miklos Szeredi <mszeredi@inf.bme.hu>
+
+ * Added major+minor version to library API, and minor version to
+ kernel API
+
2003-12-13 David McNab <david@rebirthing.co.nz>
* Implemented fsync support in examples/example.py
diff --git a/example/fusexmp.c b/example/fusexmp.c
index 2b44016..0926ff8 100644
--- a/example/fusexmp.c
+++ b/example/fusexmp.c
@@ -250,14 +250,22 @@ static int xmp_statfs(struct fuse_statfs *fst)
static int xmp_release(const char *path, int flags)
{
- /* just a stub here */
- return 0;
+ /* Just a stub. This method is optional and can safely be left
+ unimplemented */
+
+ (void) path;
+ (void) flags;
+ return 0;
}
static int xmp_fsync(const char *path, int isdatasync)
{
- /* just stub this */
- return 0;
+ /* Just a stub. This method is optional and can safely be left
+ unimplemented */
+
+ (void) path;
+ (void) isdatasync;
+ return 0;
}
static struct fuse_operations xmp_oper = {
@@ -280,7 +288,7 @@ static struct fuse_operations xmp_oper = {
write: xmp_write,
statfs: xmp_statfs,
release: xmp_release,
- fsync: xmp_fsync
+ fsync: xmp_fsync
};
diff --git a/include/fuse.h b/include/fuse.h
index 59e0ed1..b85f0d8 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -11,6 +11,12 @@
/* This file defines the library interface of FUSE */
+/** Major version of FUSE library interface */
+#define FUSE_MAJOR_VERSION 1
+
+/** Minor version of FUSE library interface */
+#define FUSE_MINOR_VERSION 1
+
/* Now and forever: this interface uses 64 bit off_t */
#define _FILE_OFFSET_BITS 64
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 08ad214..9f9609e 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -11,6 +11,9 @@
/** Version number of this interface */
#define FUSE_KERNEL_VERSION 2
+/** Minor version number of this interface */
+#define FUSE_KERNEL_MINOR_VERSION 1
+
/** The inode number of the root indode */
#define FUSE_ROOT_INO 1
diff --git a/lib/fuse.c b/lib/fuse.c
index 58611c3..d382707 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -864,17 +864,6 @@ static void do_statfs(struct fuse *f, struct fuse_in_header *in)
res = f->op.statfs((struct fuse_statfs *) &arg.st);
}
- if (0)
- {
- printf("block_size=%ld, blocks=%ld, blocks_free=%ld, files=%ld, files_free=%ld, namelen=%ld\n",
- arg.st.block_size,
- arg.st.blocks,
- arg.st.blocks_free,
- arg.st.files,
- arg.st.files_free,
- arg.st.namelen);
- }
-
send_reply(f, in, res, &arg, sizeof(arg));
}