From 74ba41239c44985ef13fb7490d25a1109a4d0371 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 23 May 2007 13:57:54 -0700 Subject: [PATCH] --- yaml --- r: 56894 b: refs/heads/master c: 889f784831d6cc9125a74eb55a5641f95635a204 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/fuse/file.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf574ecf76a9..eaac6329f096 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 492c8b332e3af279ffadf49b85967d5e43810923 +refs/heads/master: 889f784831d6cc9125a74eb55a5641f95635a204 diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c index d0ed60bc3188..adf7995232b8 100644 --- a/trunk/fs/fuse/file.c +++ b/trunk/fs/fuse/file.c @@ -610,7 +610,9 @@ static ssize_t fuse_direct_write(struct file *file, const char __user *buf, ssize_t res; /* Don't allow parallel writes to the same file */ mutex_lock(&inode->i_mutex); - res = fuse_direct_io(file, buf, count, ppos, 1); + res = generic_write_checks(file, ppos, &count, 0); + if (!res) + res = fuse_direct_io(file, buf, count, ppos, 1); mutex_unlock(&inode->i_mutex); return res; }