aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--kernel/dev.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 155cb0d..dd498f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-02 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Fix O_ASYNC handling in fuse_dev_release(). From Jeff Dike
+
2006-03-01 Miklos Szeredi <miklos@szeredi.hu>
* Add O_ASYNC and O_NONBLOCK support to FUSE device. Patch by
diff --git a/kernel/dev.c b/kernel/dev.c
index d9ffd43..f9ac1ff 100644
--- a/kernel/dev.c
+++ b/kernel/dev.c
@@ -976,9 +976,8 @@ static int fuse_dev_release(struct inode *inode, struct file *file)
}
spin_unlock(&fuse_lock);
if (fc) {
- kobject_put(&fc->kobj);
fasync_helper(-1, file, 0, &fc->fasync);
- fc->fasync = NULL;
+ kobject_put(&fc->kobj);
}
return 0;