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/sysv | |
| parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
| parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/sysv')
| -rw-r--r-- | fs/sysv/itree.c | 2 | ||||
| -rw-r--r-- | fs/sysv/sysv.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index 86f5f8d43d..f2bcccd1d6 100644 --- a/fs/sysv/itree.c +++ b/fs/sysv/itree.c | |||
| @@ -465,7 +465,7 @@ static sector_t sysv_bmap(struct address_space *mapping, sector_t block) | |||
| 465 | { | 465 | { |
| 466 | return generic_block_bmap(mapping,block,get_block); | 466 | return generic_block_bmap(mapping,block,get_block); |
| 467 | } | 467 | } |
| 468 | struct address_space_operations sysv_aops = { | 468 | const struct address_space_operations sysv_aops = { |
| 469 | .readpage = sysv_readpage, | 469 | .readpage = sysv_readpage, |
| 470 | .writepage = sysv_writepage, | 470 | .writepage = sysv_writepage, |
| 471 | .sync_page = block_sync_page, | 471 | .sync_page = block_sync_page, |
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h index 393a480e4d..9dcc821209 100644 --- a/fs/sysv/sysv.h +++ b/fs/sysv/sysv.h | |||
| @@ -161,7 +161,7 @@ extern struct inode_operations sysv_dir_inode_operations; | |||
| 161 | extern struct inode_operations sysv_fast_symlink_inode_operations; | 161 | extern struct inode_operations sysv_fast_symlink_inode_operations; |
| 162 | extern const struct file_operations sysv_file_operations; | 162 | extern const struct file_operations sysv_file_operations; |
| 163 | extern const struct file_operations sysv_dir_operations; | 163 | extern const struct file_operations sysv_dir_operations; |
| 164 | extern struct address_space_operations sysv_aops; | 164 | extern const struct address_space_operations sysv_aops; |
| 165 | extern struct super_operations sysv_sops; | 165 | extern struct super_operations sysv_sops; |
| 166 | extern struct dentry_operations sysv_dentry_operations; | 166 | extern struct dentry_operations sysv_dentry_operations; |
| 167 | 167 | ||