fix

diff --git a/ChangeLog b/ChangeLog
index 0729da768a5766e56405ccc05cefdfaf2de606a0..e8e5ab0bc3db640526c2bbafb85832cb1c85ce20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Slight optimization in returning EINVAL error in case of an open
+       with O_DIRECT flag.
+
 2005-09-20  Miklos Szeredi <miklos@szeredi.hu>
 
        * Remove '--enable-auto-modprobe' configure flag.  Module

diff --git a/kernel/file.c b/kernel/file.c
index 3177946b622eaebdaa5ffa4544b5e4a8f030e454..19bd296635a39ec567612b4df7e6b66ee763e8a7 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -27,6 +27,10 @@ int fuse_open_common(struct inode *inode, struct file *file, int isdir)
        struct fuse_file *ff;
        int err;
 
+       /* VFS checks this, but only _after_ ->open() */
+       if (file->f_flags & O_DIRECT)
+               return -EINVAL;
+
        err = generic_file_open(inode, file);
        if (err)
                return err;