From: Miklos Szeredi Date: Wed, 1 Dec 2004 18:05:27 +0000 (+0000) Subject: move linux/fuse.h to fuse_kernel.h X-Git-Tag: fuse_2_0_merge5 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ee14a5a87590c62784f8345096da3e619a6c7e04;p=qemu-gpiodev%2Flibfuse.git move linux/fuse.h to fuse_kernel.h --- diff --git a/ChangeLog b/ChangeLog index 53675e6..dffca68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-01 Miklos Szeredi + + * move linux/fuse.h to fuse_kernel.h + 2004-11-29 Miklos Szeredi * kernel: make readpage() uninterruptible diff --git a/configure.in b/configure.in index 94deca7..83946f6 100644 --- a/configure.in +++ b/configure.in @@ -51,5 +51,5 @@ AC_CHECK_MEMBERS([struct stat.st_atim]) AC_SUBST(subdirs2) -AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile include/linux/Makefile]) +AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile]) AC_OUTPUT diff --git a/include/Makefile.am b/include/Makefile.am index 9e67b61..47cb099 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = linux - include_HEADERS = fuse.h +noinst_HEADERS = fuse_kernel.h diff --git a/include/linux/.cvsignore b/include/linux/.cvsignore deleted file mode 100644 index 3e71cc3..0000000 --- a/include/linux/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile.in -Makefile -fuse.h diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am deleted file mode 100644 index 486c3d4..0000000 --- a/include/linux/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in - -noinst_HEADERS = fuse.h - -all-local: fuse.h - -fuse.h: - ln -s ../../kernel/linux/fuse.h . diff --git a/kernel/Makefile.in b/kernel/Makefile.in index 42d1807..2cb000e 100644 --- a/kernel/Makefile.in +++ b/kernel/Makefile.in @@ -7,9 +7,8 @@ majver = @majver@ VERSION = @PACKAGE_VERSION@ DISTFILES = Makefile.in configure.ac configure config.h.in ../install-sh \ - dev.c dir.c file.c inode.c util.c fuse_i.h + dev.c dir.c file.c inode.c util.c fuse_i.h fuse_kernel.h COMPATDISTFILES = compat/parser.c compat/parser.h -LINUXDISTFILES = linux/fuse.h fusemoduledir = @kmoduledir@/kernel/fs/fuse @@ -40,12 +39,10 @@ distclean: clean maintainer-clean: distclean -distdir: $(DISTFILES) $(COMPATDISTFILES) $(LINUXDISTFILES) +distdir: $(DISTFILES) $(COMPATDISTFILES) cp -p $(DISTFILES) $(distdir) mkdir $(distdir)/compat cp -p $(COMPATDISTFILES) $(distdir)/compat - mkdir $(distdir)/linux - cp -p $(LINUXDISTFILES) $(distdir)/linux ifeq ($(majver), 2.4) @@ -66,7 +63,7 @@ all-spec: fuse.o fuse.o: $(fuse_objs) $(LD) -r -o fuse.o $(fuse_objs) -fuse_headers = fuse_i.h linux/fuse.h +fuse_headers = fuse_i.h fuse_kernel.h dev.o: $(fuse_headers) dir.o: $(fuse_headers) diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index d2eeece..52d8187 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -7,7 +7,7 @@ */ -#include +#include "fuse_kernel.h" #include #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) diff --git a/kernel/fuse_kernel.h b/kernel/fuse_kernel.h new file mode 100644 index 0000000..17d62f8 --- /dev/null +++ b/kernel/fuse_kernel.h @@ -0,0 +1,239 @@ +/* + FUSE: Filesystem in Userspace + Copyright (C) 2001-2004 Miklos Szeredi + + This program can be distributed under the terms of the GNU GPL. + See the file COPYING. +*/ + +/* This file defines the kernel interface of FUSE */ + +/** Version number of this interface */ +#define FUSE_KERNEL_VERSION 4 + +/** Minor version number of this interface */ +#define FUSE_KERNEL_MINOR_VERSION 1 + +/** The inode number of the root indode */ +#define FUSE_ROOT_INO 1 + +/** Opening this will yield a new control file */ +#define FUSE_DEV "/proc/fs/fuse/dev" + +/** The file containing the version in the form MAJOR.MINOR */ +#define FUSE_VERSION_FILE "/proc/fs/fuse/version" + +struct fuse_attr { + unsigned long _user_ino; + unsigned int mode; + unsigned int nlink; + unsigned int uid; + unsigned int gid; + unsigned int rdev; + unsigned long long size; + unsigned long blocks; + unsigned long atime; + unsigned long atimensec; + unsigned long mtime; + unsigned long mtimensec; + unsigned long ctime; + unsigned long ctimensec; +}; + +struct fuse_kstatfs { + 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) +#define FATTR_UID (1 << 1) +#define FATTR_GID (1 << 2) +#define FATTR_SIZE (1 << 3) +#define FATTR_ATIME (1 << 4) +#define FATTR_MTIME (1 << 5) +#define FATTR_CTIME (1 << 6) + +enum fuse_opcode { + FUSE_LOOKUP = 1, + FUSE_FORGET = 2, /* no reply */ + FUSE_GETATTR = 3, + FUSE_SETATTR = 4, + FUSE_READLINK = 5, + FUSE_SYMLINK = 6, + FUSE_GETDIR = 7, + FUSE_MKNOD = 8, + FUSE_MKDIR = 9, + FUSE_UNLINK = 10, + FUSE_RMDIR = 11, + FUSE_RENAME = 12, + FUSE_LINK = 13, + FUSE_OPEN = 14, + FUSE_READ = 15, + FUSE_WRITE = 16, + FUSE_STATFS = 17, + FUSE_RELEASE = 18, /* no reply */ + FUSE_INVALIDATE = 19, /* user initiated */ + FUSE_FSYNC = 20, + FUSE_SETXATTR = 21, + FUSE_GETXATTR = 22, + FUSE_LISTXATTR = 23, + FUSE_REMOVEXATTR = 24, + FUSE_FLUSH = 25, +}; + +/* Conservative buffer size for the client */ +#define FUSE_MAX_IN 8192 + +#define FUSE_NAME_MAX 1024 +#define FUSE_SYMLINK_MAX 4096 +#define FUSE_XATTR_SIZE_MAX 4096 + +struct fuse_entry_out { + unsigned long ino; /* Inode number */ + unsigned long generation; /* Inode generation: ino:gen must + be unique for the fs's lifetime */ + unsigned long entry_valid; /* Cache timeout for the name */ + unsigned long entry_valid_nsec; + unsigned long attr_valid; /* Cache timeout for the attributes */ + unsigned long attr_valid_nsec; + struct fuse_attr attr; +}; + +struct fuse_forget_in { + int version; +}; + +struct fuse_attr_out { + unsigned long attr_valid; /* Cache timeout for the attributes */ + unsigned long attr_valid_nsec; + struct fuse_attr attr; +}; + +struct fuse_getdir_out { + int fd; +}; + +struct fuse_mknod_in { + unsigned int mode; + unsigned int rdev; +}; + +struct fuse_mkdir_in { + unsigned int mode; +}; + +struct fuse_rename_in { + unsigned long newdir; +}; + +struct fuse_link_in { + unsigned long newdir; +}; + +struct fuse_setattr_in { + struct fuse_attr attr; + unsigned int valid; +}; + +struct fuse_open_in { + unsigned int flags; +}; + +struct fuse_open_out { + unsigned long fh; + unsigned int _open_flags; +}; + +struct fuse_release_in { + unsigned long fh; + unsigned int flags; +}; + +struct fuse_flush_in { + unsigned long fh; + unsigned int _nref; +}; + +struct fuse_read_in { + unsigned long fh; + unsigned long long offset; + unsigned int size; +}; + +struct fuse_write_in { + int writepage; + unsigned long fh; + unsigned long long offset; + unsigned int size; +}; + +struct fuse_write_out { + unsigned int size; +}; + +struct fuse_statfs_out { + struct fuse_kstatfs st; +}; + +struct fuse_fsync_in { + unsigned long fh; + int datasync; +}; + +struct fuse_setxattr_in { + unsigned int size; + unsigned int flags; +}; + +struct fuse_getxattr_in { + unsigned int size; +}; + +struct fuse_getxattr_out { + unsigned int size; +}; + +struct fuse_in_header { + int unique; + enum fuse_opcode opcode; + unsigned long ino; + unsigned int uid; + unsigned int gid; + unsigned int pid; +}; + +struct fuse_out_header { + int unique; + int error; +}; + +struct fuse_user_header { + int unique; /* zero */ + enum fuse_opcode opcode; + unsigned long ino; + unsigned long _user_ino; +}; + +struct fuse_dirent { + unsigned long ino; + unsigned short namelen; + unsigned char type; + char name[256]; +}; + +#define FUSE_NAME_OFFSET ((unsigned int) ((struct fuse_dirent *) 0)->name) +#define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(long) - 1) & ~(sizeof(long) - 1)) +#define FUSE_DIRENT_SIZE(d) \ + FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen) + +/* + * Local Variables: + * indent-tabs-mode: t + * c-basic-offset: 8 + * End: + */ diff --git a/kernel/linux/fuse.h b/kernel/linux/fuse.h deleted file mode 100644 index 17d62f8..0000000 --- a/kernel/linux/fuse.h +++ /dev/null @@ -1,239 +0,0 @@ -/* - FUSE: Filesystem in Userspace - Copyright (C) 2001-2004 Miklos Szeredi - - This program can be distributed under the terms of the GNU GPL. - See the file COPYING. -*/ - -/* This file defines the kernel interface of FUSE */ - -/** Version number of this interface */ -#define FUSE_KERNEL_VERSION 4 - -/** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 1 - -/** The inode number of the root indode */ -#define FUSE_ROOT_INO 1 - -/** Opening this will yield a new control file */ -#define FUSE_DEV "/proc/fs/fuse/dev" - -/** The file containing the version in the form MAJOR.MINOR */ -#define FUSE_VERSION_FILE "/proc/fs/fuse/version" - -struct fuse_attr { - unsigned long _user_ino; - unsigned int mode; - unsigned int nlink; - unsigned int uid; - unsigned int gid; - unsigned int rdev; - unsigned long long size; - unsigned long blocks; - unsigned long atime; - unsigned long atimensec; - unsigned long mtime; - unsigned long mtimensec; - unsigned long ctime; - unsigned long ctimensec; -}; - -struct fuse_kstatfs { - 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) -#define FATTR_UID (1 << 1) -#define FATTR_GID (1 << 2) -#define FATTR_SIZE (1 << 3) -#define FATTR_ATIME (1 << 4) -#define FATTR_MTIME (1 << 5) -#define FATTR_CTIME (1 << 6) - -enum fuse_opcode { - FUSE_LOOKUP = 1, - FUSE_FORGET = 2, /* no reply */ - FUSE_GETATTR = 3, - FUSE_SETATTR = 4, - FUSE_READLINK = 5, - FUSE_SYMLINK = 6, - FUSE_GETDIR = 7, - FUSE_MKNOD = 8, - FUSE_MKDIR = 9, - FUSE_UNLINK = 10, - FUSE_RMDIR = 11, - FUSE_RENAME = 12, - FUSE_LINK = 13, - FUSE_OPEN = 14, - FUSE_READ = 15, - FUSE_WRITE = 16, - FUSE_STATFS = 17, - FUSE_RELEASE = 18, /* no reply */ - FUSE_INVALIDATE = 19, /* user initiated */ - FUSE_FSYNC = 20, - FUSE_SETXATTR = 21, - FUSE_GETXATTR = 22, - FUSE_LISTXATTR = 23, - FUSE_REMOVEXATTR = 24, - FUSE_FLUSH = 25, -}; - -/* Conservative buffer size for the client */ -#define FUSE_MAX_IN 8192 - -#define FUSE_NAME_MAX 1024 -#define FUSE_SYMLINK_MAX 4096 -#define FUSE_XATTR_SIZE_MAX 4096 - -struct fuse_entry_out { - unsigned long ino; /* Inode number */ - unsigned long generation; /* Inode generation: ino:gen must - be unique for the fs's lifetime */ - unsigned long entry_valid; /* Cache timeout for the name */ - unsigned long entry_valid_nsec; - unsigned long attr_valid; /* Cache timeout for the attributes */ - unsigned long attr_valid_nsec; - struct fuse_attr attr; -}; - -struct fuse_forget_in { - int version; -}; - -struct fuse_attr_out { - unsigned long attr_valid; /* Cache timeout for the attributes */ - unsigned long attr_valid_nsec; - struct fuse_attr attr; -}; - -struct fuse_getdir_out { - int fd; -}; - -struct fuse_mknod_in { - unsigned int mode; - unsigned int rdev; -}; - -struct fuse_mkdir_in { - unsigned int mode; -}; - -struct fuse_rename_in { - unsigned long newdir; -}; - -struct fuse_link_in { - unsigned long newdir; -}; - -struct fuse_setattr_in { - struct fuse_attr attr; - unsigned int valid; -}; - -struct fuse_open_in { - unsigned int flags; -}; - -struct fuse_open_out { - unsigned long fh; - unsigned int _open_flags; -}; - -struct fuse_release_in { - unsigned long fh; - unsigned int flags; -}; - -struct fuse_flush_in { - unsigned long fh; - unsigned int _nref; -}; - -struct fuse_read_in { - unsigned long fh; - unsigned long long offset; - unsigned int size; -}; - -struct fuse_write_in { - int writepage; - unsigned long fh; - unsigned long long offset; - unsigned int size; -}; - -struct fuse_write_out { - unsigned int size; -}; - -struct fuse_statfs_out { - struct fuse_kstatfs st; -}; - -struct fuse_fsync_in { - unsigned long fh; - int datasync; -}; - -struct fuse_setxattr_in { - unsigned int size; - unsigned int flags; -}; - -struct fuse_getxattr_in { - unsigned int size; -}; - -struct fuse_getxattr_out { - unsigned int size; -}; - -struct fuse_in_header { - int unique; - enum fuse_opcode opcode; - unsigned long ino; - unsigned int uid; - unsigned int gid; - unsigned int pid; -}; - -struct fuse_out_header { - int unique; - int error; -}; - -struct fuse_user_header { - int unique; /* zero */ - enum fuse_opcode opcode; - unsigned long ino; - unsigned long _user_ino; -}; - -struct fuse_dirent { - unsigned long ino; - unsigned short namelen; - unsigned char type; - char name[256]; -}; - -#define FUSE_NAME_OFFSET ((unsigned int) ((struct fuse_dirent *) 0)->name) -#define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(long) - 1) & ~(sizeof(long) - 1)) -#define FUSE_DIRENT_SIZE(d) \ - FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen) - -/* - * Local Variables: - * indent-tabs-mode: t - * c-basic-offset: 8 - * End: - */ diff --git a/lib/fuse.c b/lib/fuse.c index 2fa6032..2bca945 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -8,7 +8,7 @@ #include #include "fuse_i.h" -#include +#include "fuse_kernel.h" #include #include diff --git a/makeconf.sh b/makeconf.sh index 34090e9..dc563d9 100755 --- a/makeconf.sh +++ b/makeconf.sh @@ -24,6 +24,8 @@ else autoconf ) fi +echo Linking kernel header file... +ln -sf ../kernel/fuse_kernel.h `dirname $0`/include rm -f config.cache config.status echo "To compile run './configure', and then 'make'." diff --git a/util/fusermount.c b/util/fusermount.c index c8c17b6..475e655 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -33,7 +33,6 @@ #include #include #include -#include #define FUSE_COMMFD_ENV "_FUSE_COMMFD"