aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Miklos Szeredi <miklos@szeredi.hu>2004-02-06 17:02:08 +0000
committerGravatar Miklos Szeredi <miklos@szeredi.hu>2004-02-06 17:02:08 +0000
commit89b86af80cf6c7cb0391419e95b4e202250cb724 (patch)
tree9caee2ab6fb98963aef5e66e14cea623147e7a60
parent55a078f86d6e471a7d28d5acf17efb97b74a97fd (diff)
fix loopback mounting fuse files
-rw-r--r--ChangeLog2
-rw-r--r--kernel/file.c15
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a569ed..97c281e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
* Readpage calls flush_dcache_page() after storing data
* Use i_size_read/write for accessing inode->i_size
+
+ * Make loopback mount of a fuse file work
2004-02-04 Miklos Szeredi <mszeredi@inf.bme.hu>
diff --git a/kernel/file.c b/kernel/file.c
index 594d712..99e7ada 100644
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -462,12 +462,15 @@ static int fuse_commit_write(struct file *file, struct page *page,
}
static struct file_operations fuse_file_operations = {
- .open = fuse_open,
- .release = fuse_release,
- .fsync = fuse_fsync,
- .read = fuse_file_read,
- .write = generic_file_write,
- .mmap = generic_file_mmap,
+ .read = fuse_file_read,
+ .write = generic_file_write,
+ .mmap = generic_file_mmap,
+ .open = fuse_open,
+ .release = fuse_release,
+ .fsync = fuse_fsync,
+#ifdef KERNEL_2_6
+ .sendfile = generic_file_sendfile,
+#endif
};
static struct address_space_operations fuse_file_aops = {