summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 14:00:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 14:00:09 -0800
commitd0964c37b539c2b76752b1ff8b0a618c5f82f077 (patch)
treebcfce130d8a2462ebbad14000c53943929511c23 /fs
parentff961c68b140fc99946b94b7dbed8cd1f1333ff4 (diff)
parent1b7323965a8c6eee9dc4e345a7ae4bff1dc93149 (diff)
downloadlinux-3.10-d0964c37b539c2b76752b1ff8b0a618c5f82f077.tar.gz
linux-3.10-d0964c37b539c2b76752b1ff8b0a618c5f82f077.tar.bz2
linux-3.10-d0964c37b539c2b76752b1ff8b0a618c5f82f077.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: reject O_DIRECT flag also in fuse_create
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dir.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 8ada78aade5..4787ae6c5c1 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -385,6 +385,9 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
if (fc->no_create)
return -ENOSYS;
+ if (flags & O_DIRECT)
+ return -EINVAL;
+
forget_req = fuse_get_req(fc);
if (IS_ERR(forget_req))
return PTR_ERR(forget_req);