[PATCH] FUSE: disable sendfile with direct_io

[Miklos Szeredi <miklos@szeredi.hu>]

In case a filesystem is mounted with "direct_io", sendfile should not
use the generic function, but return an error instead.  The generic
sendfile uses the page cache, which could return stale data.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>

diff -rup linux-2.6.12-rc2-mm3/fs/fuse/file.c linux-fuse/fs/fuse/file.c
--- linux-2.6.12-rc2-mm3/fs/fuse/file.c	2005-04-24 17:41:47.000000000 +0200
+++ linux-fuse/fs/fuse/file.c	2005-04-24 17:42:53.000000000 +0200
@@ -531,6 +531,17 @@ static int fuse_file_mmap(struct file *f
 	return generic_file_mmap(file, vma);
 }
 
+static ssize_t fuse_file_sendfile(struct file *file, loff_t *ppos,
+				  size_t count, read_actor_t actor,
+				  void *target)
+{
+	struct fuse_conn *fc = get_fuse_conn(file->f_dentry->d_inode);
+	if (fc->flags & FUSE_DIRECT_IO)
+		return -EINVAL;
+	else
+		return generic_file_sendfile(file, ppos, count, actor, target);
+}
+
 static int fuse_set_page_dirty(struct page *page)
 {
 	printk("fuse_set_page_dirty: should not happen\n");
@@ -547,7 +558,7 @@ static struct file_operations fuse_file_
 	.flush		= fuse_flush,
 	.release	= fuse_release,
 	.fsync		= fuse_fsync,
-	.sendfile	= generic_file_sendfile,
+	.sendfile	= fuse_file_sendfile,
 };
 
 static struct address_space_operations fuse_file_aops  = {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/