*** empty log message ***

diff --git a/AUTHORS b/AUTHORS
index 978027ea170cd1c86dc26aad507cbe9e5cc09540..cfdba8e76c0c7f6c253eb6cd2d5134c8953a3162 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,15 +2,3 @@ FUSE core
 ---------
 
 Miklos Szeredi     <miklos@szeredi.hu>
-
-
-Python bindings
----------------
-
-Jeff Epler         <jepler@unpythonic.dhs.org>
-
-
-Perl bindings
--------------
-
-Mark Glines        <mark@glines.org>

diff --git a/BUGS b/BUGS
deleted file mode 100644 (file)
index 5fdce02..0000000
--- a/BUGS
+++ /dev/null
@@ -1,10 +0,0 @@
-- It is allowed to mount a directory on a non-directory.
-
-- I want really low priority for my cached pages.  Can they start out
-  'old' so they will be thrown out on the first oportunity?
-
-- File size change could cause some strange behavior WRT the page
-  cache.
-
-- User can cause nasty DoS by not replying to WRITE requests and thus
-  blocking writepage() indefinitely.

diff --git a/ChangeLog b/ChangeLog
index 72d93af0d7f8fb857e782081e75ec9b9c140a4d4..c801303ae3ae695f08e57bd1bc63bfbe5113b92d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * Separate configure for the kernel directory
 
+       * Don't allow write to return more than 'count'
+
+       * Extend kernel interface for future use
+
 2004-11-09  Miklos Szeredi <miklos@szeredi.hu>
 
        * Split 2.0 branch

diff --git a/Makefile.am b/Makefile.am
index aaf50981a9fa66526d5e0c48b4c8e51ba699640e..28f5b323b3e6ec3aebeaa1f13eda0ce2b7b90e1f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST =                    \
        fuse.pc.in              \
        README*                 \
        Filesystems             \
-       BUGS                    \
+       FAQ                     \
        doc/how-fuse-works
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/NEWS b/NEWS
index 13a84e125fcead003870173f09da06028bb6bbbe..512ccbcb2b198fae1835937235c9a441ce8389c1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+What is new in 2.1
+
+* Bug fixes
+
+* Improved support for filesystems implementing a custom event-loop
+
+* Add 'pkg-config' support
+
+* Kernel module can be compiled separately
+
+============================================================================
+
 What is new in 1.9
 
 * Lots of bugs fixed
@@ -20,6 +32,8 @@ What is new in 1.9
 
 * Extended attributes support
 
+============================================================================
+
 What is new in 1.3
 
 * Thanks to user bugreports and stress testing with LTP and sfx-linux
@@ -35,6 +49,8 @@ What is new in 1.2
 
 * Other bugfixes
 
+============================================================================
+
 What is new in 1.1
 
 * Support for the 2.6 kernels
@@ -50,6 +66,7 @@ What is new in 1.1
 
 * Bugfixes
 
+============================================================================
 
 What is new in 1.0
 

diff --git a/README-2.6 b/README-2.6
deleted file mode 100644 (file)
index 8cc4fa1..0000000
--- a/README-2.6
+++ /dev/null
@@ -1,4 +0,0 @@
-To use kbuild, you need write access to .tmp_versions/ and
-.__modpost.cmd in KERNELDIR.
-
-HINT: chmod them 1777

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 2f7b74b7061c54f1ab25615ba245e1cf6e75bfe0..42d1807f58f21fbbeeb99afb56ae9938f2bd1721 100644 (file)
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -6,7 +6,7 @@ mkdir_p = mkdir -p
 majver = @majver@
 VERSION = @PACKAGE_VERSION@
 
-DISTFILES = Makefile.in configure.ac configure config.h.in makeconf.sh \
+DISTFILES = Makefile.in configure.ac configure config.h.in ../install-sh \
        dev.c dir.c file.c inode.c util.c fuse_i.h
 COMPATDISTFILES = compat/parser.c compat/parser.h
 LINUXDISTFILES = linux/fuse.h

diff --git a/kernel/configure.ac b/kernel/configure.ac
index 8dce5bd1b4a7bac3c07326097df45c6e07a7eff8..0dad9cbe6f4d5e06f82c0bb1c12ffcdaa128d8fa 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,6 +1,8 @@
 AC_INIT(fuse-kernel, 2.1-pre0)
 AC_CONFIG_HEADERS([config.h])
 
+AC_PROG_INSTALL
+
 AC_MSG_CHECKING([kernel source directory])
 kernelsrc=
 AC_ARG_WITH(kernel,

diff --git a/kernel/file.c b/kernel/file.c
index f4e0b56e4a98a9281823682b5d57712264535d4a..aa6662b7af22e3f72b7414f7b8663c6776e341d4 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -614,8 +614,12 @@ static ssize_t fuse_send_write(struct fuse_req *req, int writepage,
        req->out.args[0].value = &outarg;
        request_send(fc, req);
        res = req->out.h.error;
-       if (!res)
-               return outarg.size;
+       if (!res) {
+               if (outarg.size > count)
+                       return -EPROTO;
+               else
+                       return outarg.size;
+       }
        else
                return res;
 }

diff --git a/kernel/linux/fuse.h b/kernel/linux/fuse.h
index 9c08b601d6597389f3532ea9910891a3efd8b380..e2a4124e187dfaa6dc20555cd15fe0c2a123ec2a 100644 (file)
--- a/kernel/linux/fuse.h
+++ b/kernel/linux/fuse.h
@@ -24,7 +24,7 @@
 #define FUSE_VERSION_FILE "/proc/fs/fuse/version"
 
 struct fuse_attr {
-       unsigned long       _user_ino; /* unused, for forward compatibility */
+       unsigned long       _user_ino;
        unsigned int        mode;
        unsigned int        nlink;
        unsigned int        uid;
@@ -146,6 +146,9 @@ struct fuse_open_in {
 
 struct fuse_open_out {
        unsigned long fh;
+       unsigned long _data_valid;
+       unsigned long _data_valid_nsec;
+       unsigned int _open_flags;
 };
 
 struct fuse_release_in {
@@ -155,6 +158,7 @@ struct fuse_release_in {
 
 struct fuse_flush_in {
        unsigned long fh;
+       unsigned int _nref;
 };
 
 struct fuse_read_in {
@@ -214,7 +218,7 @@ struct fuse_user_header {
        int unique; /* zero */
        enum fuse_opcode opcode;
        unsigned long ino;
-       unsigned long _user_ino;  /* unused, for forward compatibility */
+       unsigned long _user_ino;
 };
 
 struct fuse_dirent {