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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
freevxfs
/
vxfs_inode.c
diff --git
a/fs/freevxfs/vxfs_inode.c
b/fs/freevxfs/vxfs_inode.c
index
f544aae
..
0b7ae89
100644
(file)
--- a/
fs/freevxfs/vxfs_inode.c
+++ b/
fs/freevxfs/vxfs_inode.c
@@
-41,12
+41,12
@@
#include "vxfs_extern.h"
#include "vxfs_extern.h"
-extern struct address_space_operations vxfs_aops;
-extern struct address_space_operations vxfs_immed_aops;
+extern
const
struct address_space_operations vxfs_aops;
+extern
const
struct address_space_operations vxfs_immed_aops;
extern struct inode_operations vxfs_immed_symlink_iops;
extern struct inode_operations vxfs_immed_symlink_iops;
-
kmem_cache_t
*vxfs_inode_cachep;
+
struct kmem_cache
*vxfs_inode_cachep;
#ifdef DIAGNOSTIC
#ifdef DIAGNOSTIC
@@
-103,7
+103,7
@@
vxfs_blkiget(struct super_block *sbp, u_long extent, ino_t ino)
struct vxfs_inode_info *vip;
struct vxfs_dinode *dip;
struct vxfs_inode_info *vip;
struct vxfs_dinode *dip;
- if (!(vip = kmem_cache_alloc(vxfs_inode_cachep,
SLAB
_KERNEL)))
+ if (!(vip = kmem_cache_alloc(vxfs_inode_cachep,
GFP
_KERNEL)))
goto fail;
dip = (struct vxfs_dinode *)(bp->b_data + offset);
memcpy(vip, dip, sizeof(*vip));
goto fail;
dip = (struct vxfs_dinode *)(bp->b_data + offset);
memcpy(vip, dip, sizeof(*vip));
@@
-145,7
+145,7
@@
__vxfs_iget(ino_t ino, struct inode *ilistp)
struct vxfs_dinode *dip;
caddr_t kaddr = (char *)page_address(pp);
struct vxfs_dinode *dip;
caddr_t kaddr = (char *)page_address(pp);
- if (!(vip = kmem_cache_alloc(vxfs_inode_cachep,
SLAB
_KERNEL)))
+ if (!(vip = kmem_cache_alloc(vxfs_inode_cachep,
GFP
_KERNEL)))
goto fail;
dip = (struct vxfs_dinode *)(kaddr + offset);
memcpy(vip, dip, sizeof(*vip));
goto fail;
dip = (struct vxfs_dinode *)(kaddr + offset);
memcpy(vip, dip, sizeof(*vip));
@@
-239,11
+239,10
@@
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->
u.generic_ip = (void *)
vip;
+ ip->
i_private =
vip;
}
}
@@
-295,7
+294,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;
-
struct address_space_operations
*aops;
+
const 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)))
@@
-338,5
+337,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->
u.generic_ip
);
+ kmem_cache_free(vxfs_inode_cachep, ip->
i_private
);
}
}