diff options
| author |  Miklos Szeredi <miklos@szeredi.hu> | 2002-10-07 10:24:26 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2002-10-07 10:24:26 +0000 |
| commit | 24ed9451bdd3450954e900c77a767ed3bcb17e72 (patch) | |
| tree | 5a0b365762011eadd00b2c2e76fda16823db4187 /include | |
| parent | 27fc1b30dcd61555597363a4ab12e457e467d73c (diff) | |
statfs header cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/fuse.h | 11 | ||||
| -rw-r--r-- | include/fusestat.h | 14 | ||||
| -rw-r--r-- | include/linux/fuse.h | 12 |
4 files changed, 21 insertions, 18 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index baeb37e..9e67b61 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,4 +2,4 @@ SUBDIRS = linux -include_HEADERS = fuse.h fusestat.h +include_HEADERS = fuse.h diff --git a/include/fuse.h b/include/fuse.h index 27b08de..78cd877 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -15,7 +15,6 @@ #include <sys/stat.h> #include <utime.h> -#include <fusestat.h> /* ----------------------------------------------------------- * * Basic FUSE API * * ----------------------------------------------------------- */ @@ -23,6 +22,16 @@ /** 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; diff --git a/include/fusestat.h b/include/fusestat.h deleted file mode 100644 index a18509c..0000000 --- a/include/fusestat.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __FUSESTAT_H_ -#define __FUSESTAT_H_ -/* this is seperated out into its own file because both - * kernel and lib use it, but neither can #include the - * other's headerfile */ -typedef struct fuse_statfs { - long block_size; - long blocks; - long blocks_free; - long files; - long files_free; - long namelen; -} fuse_statfs_t; -#endif diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 539ebce..b6f41db 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h @@ -8,7 +8,6 @@ /* This file defines the kernel interface of FUSE */ -#include "fusestat.h" /** Version number of this interface */ #define FUSE_KERNEL_VERSION 2 @@ -61,6 +60,15 @@ struct fuse_attr { unsigned long ctime; }; +struct fuse_kstatfs { + long block_size; + long blocks; + long blocks_free; + long files; + long files_free; + long namelen; +}; + #define FATTR_MODE (1 << 0) #define FATTR_UID (1 << 1) #define FATTR_GID (1 << 2) @@ -159,7 +167,7 @@ struct fuse_write_in { }; struct fuse_statfs_out { - struct fuse_statfs st; + struct fuse_kstatfs st; }; struct fuse_in_header { |