diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /fs/fuse/file.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'fs/fuse/file.c')
-rw-r--r-- | fs/fuse/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 6f05379b0a0d..975f2697e866 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | 14 | ||
15 | static struct file_operations fuse_direct_io_file_operations; | 15 | static const struct file_operations fuse_direct_io_file_operations; |
16 | 16 | ||
17 | static int fuse_send_open(struct inode *inode, struct file *file, int isdir, | 17 | static int fuse_send_open(struct inode *inode, struct file *file, int isdir, |
18 | struct fuse_open_out *outargp) | 18 | struct fuse_open_out *outargp) |
@@ -611,7 +611,7 @@ static int fuse_set_page_dirty(struct page *page) | |||
611 | return 0; | 611 | return 0; |
612 | } | 612 | } |
613 | 613 | ||
614 | static struct file_operations fuse_file_operations = { | 614 | static const struct file_operations fuse_file_operations = { |
615 | .llseek = generic_file_llseek, | 615 | .llseek = generic_file_llseek, |
616 | .read = generic_file_read, | 616 | .read = generic_file_read, |
617 | .write = generic_file_write, | 617 | .write = generic_file_write, |
@@ -623,7 +623,7 @@ static struct file_operations fuse_file_operations = { | |||
623 | .sendfile = generic_file_sendfile, | 623 | .sendfile = generic_file_sendfile, |
624 | }; | 624 | }; |
625 | 625 | ||
626 | static struct file_operations fuse_direct_io_file_operations = { | 626 | static const struct file_operations fuse_direct_io_file_operations = { |
627 | .llseek = generic_file_llseek, | 627 | .llseek = generic_file_llseek, |
628 | .read = fuse_direct_read, | 628 | .read = fuse_direct_read, |
629 | .write = fuse_direct_write, | 629 | .write = fuse_direct_write, |