fix

diff --git a/ChangeLog b/ChangeLog
index 31d4291674698ffd3b3dd8d17f0d1e3d6b21a516..7a5450cee8b90a60abfb2dbe617f60c115352ecc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-26  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Reset request in fuse_flush() (bugreport by David Shaw)
+
 2004-10-21  Miklos Szeredi <miklos@szeredi.hu>
 
        * fuse_main() now does not exit on error, rather it returns an

diff --git a/kernel/file.c b/kernel/file.c
index 91fd07b17adeb924bdb9717fcbb47838cd468354..f4e0b56e4a98a9281823682b5d57712264535d4a 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -175,6 +175,7 @@ static int fuse_flush(struct file *file)
        req->in.args[0].value = &inarg;
        request_send_nonint(fc, req);
        err = req->out.h.error;
+       fuse_reset_request(req);
        up(&inode->i_sem);
        if (err == -ENOSYS) {
                fc->no_flush = 1;