aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-10-16 10:08:57 -0400
committerMiklos Szeredi <miklos@szeredi.hu>2008-10-16 10:08:57 -0400
commita7c1b990f71574e077b94ce4582e2cf11cb891fe (patch)
tree9192239167f6047c4f5fbc64d530904ac4f8de86
parent29d434b39c807320fbe4bcdce0ab98a0b9fcb285 (diff)
fuse: implement nonseekable open
Let the client request nonseekable open using FOPEN_NONSEEKABLE and call nonseekable_open() on the file if requested. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
-rw-r--r--fs/fuse/file.c2
-rw-r--r--include/linux/fuse.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 98079aa800e8..34930a964b82 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -101,6 +101,8 @@ void fuse_finish_open(struct inode *inode, struct file *file,
101 file->f_op = &fuse_direct_io_file_operations; 101 file->f_op = &fuse_direct_io_file_operations;
102 if (!(outarg->open_flags & FOPEN_KEEP_CACHE)) 102 if (!(outarg->open_flags & FOPEN_KEEP_CACHE))
103 invalidate_inode_pages2(inode->i_mapping); 103 invalidate_inode_pages2(inode->i_mapping);
104 if (outarg->open_flags & FOPEN_NONSEEKABLE)
105 nonseekable_open(inode, file);
104 ff->fh = outarg->fh; 106 ff->fh = outarg->fh;
105 file->private_data = fuse_file_get(ff); 107 file->private_data = fuse_file_get(ff);
106} 108}
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 8bc1101e9b35..350fe9767bbc 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -17,6 +17,9 @@
17 * - add lock_owner field to fuse_setattr_in, fuse_read_in and fuse_write_in 17 * - add lock_owner field to fuse_setattr_in, fuse_read_in and fuse_write_in
18 * - add blksize field to fuse_attr 18 * - add blksize field to fuse_attr
19 * - add file flags field to fuse_read_in and fuse_write_in 19 * - add file flags field to fuse_read_in and fuse_write_in
20 *
21 * 7.10
22 * - add nonseekable open flag
20 */ 23 */
21 24
22#ifndef _LINUX_FUSE_H 25#ifndef _LINUX_FUSE_H
@@ -29,7 +32,7 @@
29#define FUSE_KERNEL_VERSION 7 32#define FUSE_KERNEL_VERSION 7
30 33
31/** Minor version number of this interface */ 34/** Minor version number of this interface */
32#define FUSE_KERNEL_MINOR_VERSION 9 35#define FUSE_KERNEL_MINOR_VERSION 10
33 36
34/** The node ID of the root inode */ 37/** The node ID of the root inode */
35#define FUSE_ROOT_ID 1 38#define FUSE_ROOT_ID 1
@@ -101,9 +104,11 @@ struct fuse_file_lock {
101 * 104 *
102 * FOPEN_DIRECT_IO: bypass page cache for this open file 105 * FOPEN_DIRECT_IO: bypass page cache for this open file
103 * FOPEN_KEEP_CACHE: don't invalidate the data cache on open 106 * FOPEN_KEEP_CACHE: don't invalidate the data cache on open
107 * FOPEN_NONSEEKABLE: the file is not seekable
104 */ 108 */
105#define FOPEN_DIRECT_IO (1 << 0) 109#define FOPEN_DIRECT_IO (1 << 0)
106#define FOPEN_KEEP_CACHE (1 << 1) 110#define FOPEN_KEEP_CACHE (1 << 1)
111#define FOPEN_NONSEEKABLE (1 << 2)
107 112
108/** 113/**
109 * INIT request/reply flags 114 * INIT request/reply flags