diff options
| author |  Miklos Szeredi <miklos@szeredi.hu> | 2004-02-19 14:23:27 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-02-19 14:23:27 +0000 |
| commit | 18e75e4cb186b5d247caea5c9aa21b69e4914c50 (patch) | |
| tree | 71fdaa602c8c70ecf933a9ec4cd3e4d8156026e8 /include | |
| parent | fa39e90ea08e2d6f976deec8f12eda27a14e0813 (diff) | |
statfs fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/fuse.h | 15 | ||||
| -rw-r--r-- | include/linux/fuse.h | 17 |
2 files changed, 12 insertions, 20 deletions
diff --git a/include/fuse.h b/include/fuse.h index c2f0be4..7fdcc6e 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -12,7 +12,7 @@ /* This file defines the library interface of FUSE */ /** Major version of FUSE library interface */ -#define FUSE_MAJOR_VERSION 1 +#define FUSE_MAJOR_VERSION 2 /** Minor version of FUSE library interface */ #define FUSE_MINOR_VERSION 1 @@ -22,6 +22,7 @@ #include <sys/types.h> #include <sys/stat.h> +#include <sys/statfs.h> #include <utime.h> /* ----------------------------------------------------------- * @@ -31,16 +32,6 @@ /** Handle for a FUSE filesystem */ struct fuse; -/* Statfs structure used by FUSE */ -struct fuse_statfs { - long block_size; - long blocks; - long blocks_free; - long files; - long files_free; - long namelen; -}; - /** Handle for a getdir() operation */ typedef struct fuse_dirhandle *fuse_dirh_t; @@ -117,7 +108,7 @@ struct fuse_operations { int (*open) (const char *, int); int (*read) (const char *, char *, size_t, off_t); int (*write) (const char *, const char *, size_t, off_t); - int (*statfs) (struct fuse_statfs *); + int (*statfs) (const char *, struct statfs *); int (*release) (const char *, int); int (*fsync) (const char *, int); }; diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 909c8b0..2b516a5 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h @@ -9,10 +9,10 @@ /* This file defines the kernel interface of FUSE */ /** Version number of this interface */ -#define FUSE_KERNEL_VERSION 2 +#define FUSE_KERNEL_VERSION 3 /** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 2 +#define FUSE_KERNEL_MINOR_VERSION 1 /** The inode number of the root indode */ #define FUSE_ROOT_INO 1 @@ -74,12 +74,13 @@ struct fuse_attr { }; struct fuse_kstatfs { - long block_size; - long blocks; - long blocks_free; - long files; - long files_free; - long namelen; + unsigned int bsize; + unsigned long long blocks; + unsigned long long bfree; + unsigned long long bavail; + unsigned long long files; + unsigned long long ffree; + unsigned int namelen; }; #define FATTR_MODE (1 << 0) |