aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--kernel/file.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 31d4291..7a5450c 100644
--- 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 91fd07b..f4e0b56 100644
--- 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;