fix

diff --git a/ChangeLog b/ChangeLog
index 155cb0dd27050b938c40d1bac1ad88016521a991..dd498f45fddc5313ecd8a93f6ecf74addda0ef5d 100644 (file)
--- 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 d9ffd43f8ac23027fc7842bda62bd3822e77ea64..f9ac1ffb0356300f9af77a32c85d33d46d913ad5 100644 (file)
--- 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;