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/freevxfs/vxfs_inode.c | |
| parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
| parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/freevxfs/vxfs_inode.c')
| -rw-r--r-- | fs/freevxfs/vxfs_inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c index f544aae9169f..ca6a39714771 100644 --- a/fs/freevxfs/vxfs_inode.c +++ b/fs/freevxfs/vxfs_inode.c | |||
| @@ -41,8 +41,8 @@ | |||
| 41 | #include "vxfs_extern.h" | 41 | #include "vxfs_extern.h" |
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | extern struct address_space_operations vxfs_aops; | 44 | extern const struct address_space_operations vxfs_aops; |
| 45 | extern struct address_space_operations vxfs_immed_aops; | 45 | extern const struct address_space_operations vxfs_immed_aops; |
| 46 | 46 | ||
| 47 | extern struct inode_operations vxfs_immed_symlink_iops; | 47 | extern struct inode_operations vxfs_immed_symlink_iops; |
| 48 | 48 | ||
| @@ -295,7 +295,7 @@ vxfs_read_inode(struct inode *ip) | |||
| 295 | { | 295 | { |
| 296 | struct super_block *sbp = ip->i_sb; | 296 | struct super_block *sbp = ip->i_sb; |
| 297 | struct vxfs_inode_info *vip; | 297 | struct vxfs_inode_info *vip; |
| 298 | struct address_space_operations *aops; | 298 | const struct address_space_operations *aops; |
| 299 | ino_t ino = ip->i_ino; | 299 | ino_t ino = ip->i_ino; |
| 300 | 300 | ||
| 301 | if (!(vip = __vxfs_iget(ino, VXFS_SBI(sbp)->vsi_ilist))) | 301 | if (!(vip = __vxfs_iget(ino, VXFS_SBI(sbp)->vsi_ilist))) |