diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-28 23:27:48 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-28 23:27:48 -0400 |
commit | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (patch) | |
tree | 7b72b1fae85137435d5b98f4614df2195f612acc /fs/fuse | |
parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 28aa81eae2..63614ed163 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -770,7 +770,7 @@ static const struct file_operations fuse_direct_io_file_operations = { | |||
770 | /* no mmap and sendfile */ | 770 | /* no mmap and sendfile */ |
771 | }; | 771 | }; |
772 | 772 | ||
773 | static struct address_space_operations fuse_file_aops = { | 773 | static const struct address_space_operations fuse_file_aops = { |
774 | .readpage = fuse_readpage, | 774 | .readpage = fuse_readpage, |
775 | .prepare_write = fuse_prepare_write, | 775 | .prepare_write = fuse_prepare_write, |
776 | .commit_write = fuse_commit_write, | 776 | .commit_write = fuse_commit_write, |