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/ocfs2 | |
| parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
| parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/aops.c | 2 | ||||
| -rw-r--r-- | fs/ocfs2/inode.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 47152bf9a7f2..cca71317b6d6 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
| @@ -666,7 +666,7 @@ out: | |||
| 666 | return ret; | 666 | return ret; |
| 667 | } | 667 | } |
| 668 | 668 | ||
| 669 | struct address_space_operations ocfs2_aops = { | 669 | const struct address_space_operations ocfs2_aops = { |
| 670 | .readpage = ocfs2_readpage, | 670 | .readpage = ocfs2_readpage, |
| 671 | .writepage = ocfs2_writepage, | 671 | .writepage = ocfs2_writepage, |
| 672 | .prepare_write = ocfs2_prepare_write, | 672 | .prepare_write = ocfs2_prepare_write, |
diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h index 84c507961287..35140f6cf840 100644 --- a/fs/ocfs2/inode.h +++ b/fs/ocfs2/inode.h | |||
| @@ -114,7 +114,7 @@ static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode) | |||
| 114 | 114 | ||
| 115 | extern kmem_cache_t *ocfs2_inode_cache; | 115 | extern kmem_cache_t *ocfs2_inode_cache; |
| 116 | 116 | ||
| 117 | extern struct address_space_operations ocfs2_aops; | 117 | extern const struct address_space_operations ocfs2_aops; |
| 118 | 118 | ||
| 119 | struct buffer_head *ocfs2_bread(struct inode *inode, int block, | 119 | struct buffer_head *ocfs2_bread(struct inode *inode, int block, |
| 120 | int *err, int reada); | 120 | int *err, int reada); |