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/afs | |
| parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
| parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/file.c | 2 | ||||
| -rw-r--r-- | fs/afs/internal.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/file.c b/fs/afs/file.c index 7bb716887e..67d6634101 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c | |||
| @@ -35,7 +35,7 @@ struct inode_operations afs_file_inode_operations = { | |||
| 35 | .getattr = afs_inode_getattr, | 35 | .getattr = afs_inode_getattr, |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | struct address_space_operations afs_fs_aops = { | 38 | const struct address_space_operations afs_fs_aops = { |
| 39 | .readpage = afs_file_readpage, | 39 | .readpage = afs_file_readpage, |
| 40 | .sync_page = block_sync_page, | 40 | .sync_page = block_sync_page, |
| 41 | .set_page_dirty = __set_page_dirty_nobuffers, | 41 | .set_page_dirty = __set_page_dirty_nobuffers, |
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 72febdf9a3..e88b3b65ae 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h | |||
| @@ -69,7 +69,7 @@ extern const struct file_operations afs_dir_file_operations; | |||
| 69 | /* | 69 | /* |
| 70 | * file.c | 70 | * file.c |
| 71 | */ | 71 | */ |
| 72 | extern struct address_space_operations afs_fs_aops; | 72 | extern const struct address_space_operations afs_fs_aops; |
| 73 | extern struct inode_operations afs_file_inode_operations; | 73 | extern struct inode_operations afs_file_inode_operations; |
| 74 | 74 | ||
| 75 | #ifdef AFS_CACHING_SUPPORT | 75 | #ifdef AFS_CACHING_SUPPORT |