git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
freevxfs
/
vxfs_inode.c
diff --git
a/fs/freevxfs/vxfs_inode.c
b/fs/freevxfs/vxfs_inode.c
index
4786d51
..
f544aae
100644
(file)
--- a/
fs/freevxfs/vxfs_inode.c
+++ b/
fs/freevxfs/vxfs_inode.c
@@
-41,8
+41,8
@@
#include "vxfs_extern.h"
#include "vxfs_extern.h"
-extern
const
struct address_space_operations vxfs_aops;
-extern
const
struct address_space_operations vxfs_immed_aops;
+extern struct address_space_operations vxfs_aops;
+extern struct address_space_operations vxfs_immed_aops;
extern struct inode_operations vxfs_immed_symlink_iops;
extern struct inode_operations vxfs_immed_symlink_iops;
@@
-239,10
+239,11
@@
vxfs_iinit(struct inode *ip, struct vxfs_inode_info *vip)
ip->i_ctime.tv_nsec = 0;
ip->i_mtime.tv_nsec = 0;
ip->i_ctime.tv_nsec = 0;
ip->i_mtime.tv_nsec = 0;
+ ip->i_blksize = PAGE_SIZE;
ip->i_blocks = vip->vii_blocks;
ip->i_generation = vip->vii_gen;
ip->i_blocks = vip->vii_blocks;
ip->i_generation = vip->vii_gen;
- ip->
i_private =
vip;
+ ip->
u.generic_ip = (void *)
vip;
}
}
@@
-294,7
+295,7
@@
vxfs_read_inode(struct inode *ip)
{
struct super_block *sbp = ip->i_sb;
struct vxfs_inode_info *vip;
{
struct super_block *sbp = ip->i_sb;
struct vxfs_inode_info *vip;
-
const struct address_space_operations
*aops;
+
struct address_space_operations
*aops;
ino_t ino = ip->i_ino;
if (!(vip = __vxfs_iget(ino, VXFS_SBI(sbp)->vsi_ilist)))
ino_t ino = ip->i_ino;
if (!(vip = __vxfs_iget(ino, VXFS_SBI(sbp)->vsi_ilist)))
@@
-337,5
+338,5
@@
vxfs_read_inode(struct inode *ip)
void
vxfs_clear_inode(struct inode *ip)
{
void
vxfs_clear_inode(struct inode *ip)
{
- kmem_cache_free(vxfs_inode_cachep, ip->
i_private
);
+ kmem_cache_free(vxfs_inode_cachep, ip->
u.generic_ip
);
}
}