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/bfs | |
| parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
| parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/bfs')
| -rw-r--r-- | fs/bfs/bfs.h | 2 | ||||
| -rw-r--r-- | fs/bfs/file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h index 9d791004b2..31973bbbf0 100644 --- a/fs/bfs/bfs.h +++ b/fs/bfs/bfs.h | |||
| @@ -50,7 +50,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode) | |||
| 50 | /* file.c */ | 50 | /* file.c */ |
| 51 | extern struct inode_operations bfs_file_inops; | 51 | extern struct inode_operations bfs_file_inops; |
| 52 | extern const struct file_operations bfs_file_operations; | 52 | extern const struct file_operations bfs_file_operations; |
| 53 | extern struct address_space_operations bfs_aops; | 53 | extern const struct address_space_operations bfs_aops; |
| 54 | 54 | ||
| 55 | /* dir.c */ | 55 | /* dir.c */ |
| 56 | extern struct inode_operations bfs_dir_inops; | 56 | extern struct inode_operations bfs_dir_inops; |
diff --git a/fs/bfs/file.c b/fs/bfs/file.c index d83cd74a2e..3d5aca28a0 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c | |||
| @@ -153,7 +153,7 @@ static sector_t bfs_bmap(struct address_space *mapping, sector_t block) | |||
| 153 | return generic_block_bmap(mapping, block, bfs_get_block); | 153 | return generic_block_bmap(mapping, block, bfs_get_block); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | struct address_space_operations bfs_aops = { | 156 | const struct address_space_operations bfs_aops = { |
| 157 | .readpage = bfs_readpage, | 157 | .readpage = bfs_readpage, |
| 158 | .writepage = bfs_writepage, | 158 | .writepage = bfs_writepage, |
| 159 | .sync_page = block_sync_page, | 159 | .sync_page = block_sync_page, |