version numbers added

diff --git a/ChangeLog b/ChangeLog
index a6dcc376faac03d6b721ac3d2a6a2c1bb45b9035..455e59906c1e8cd473c122dec1b954cd4558b423 100644 (file)
--- 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 2b44016db9b791ce7f72c40e3c37eb343eeb6f96..0926ff8f6a8ae298b7287766c4ce6a4ba5c00aaa 100644 (file)
--- 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 59e0ed12779100a8fd18d671acd97754b754a55a..b85f0d88f7579c8ffabf63fcfb68162b107d62a3 100644 (file)
--- 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 08ad214d4005fe58fc20d9c431a5e91cf96c4fe9..9f9609ecd0d94168999cd18305c961ca04c167c4 100644 (file)
--- 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 58611c3f34cd223a2264c29564203faf2d9e7082..d382707a33695d7c2baac8c60e09ede12563b47d 100644 (file)
--- 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));
 }