diff --git a/[refs] b/[refs] index a823926bffad..23ca6a1fa6e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: daa35edc0a967d1f77c2e2c1346f57d04371487a +refs/heads/master: dd190d066b7ded8c44b2b67dd0a14bed01525d3c diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c index 6454022b0536..657ab11c173b 100644 --- a/trunk/fs/fuse/file.c +++ b/trunk/fs/fuse/file.c @@ -23,6 +23,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;