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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
freevxfs
/
vxfs_super.c
diff --git
a/fs/freevxfs/vxfs_super.c
b/fs/freevxfs/vxfs_super.c
index
0ae2c7b
..
b44c916
100644
(file)
--- a/
fs/freevxfs/vxfs_super.c
+++ b/
fs/freevxfs/vxfs_super.c
@@
-155,12
+155,11
@@
static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent)
sbp->s_flags |= MS_RDONLY;
sbp->s_flags |= MS_RDONLY;
- infp = k
m
alloc(sizeof(*infp), GFP_KERNEL);
+ infp = k
z
alloc(sizeof(*infp), GFP_KERNEL);
if (!infp) {
printk(KERN_WARNING "vxfs: unable to allocate incore superblock\n");
return -ENOMEM;
}
if (!infp) {
printk(KERN_WARNING "vxfs: unable to allocate incore superblock\n");
return -ENOMEM;
}
- memset(infp, 0, sizeof(*infp));
bsize = sb_min_blocksize(sbp, BLOCK_SIZE);
if (!bsize) {
bsize = sb_min_blocksize(sbp, BLOCK_SIZE);
if (!bsize) {
@@
-196,7
+195,7
@@
static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent)
#endif
sbp->s_magic = rsbp->vs_magic;
#endif
sbp->s_magic = rsbp->vs_magic;
- sbp->s_fs_info =
(void *)
infp;
+ sbp->s_fs_info = infp;
infp->vsi_raw = rsbp;
infp->vsi_bp = bp;
infp->vsi_raw = rsbp;
infp->vsi_bp = bp;
@@
-261,9
+260,9
@@
vxfs_init(void)
{
vxfs_inode_cachep = kmem_cache_create("vxfs_inode",
sizeof(struct vxfs_inode_info), 0,
{
vxfs_inode_cachep = kmem_cache_create("vxfs_inode",
sizeof(struct vxfs_inode_info), 0,
- SLAB_RECLAIM_ACCOUNT, NULL, NULL);
+ SLAB_RECLAIM_ACCOUNT
|SLAB_MEM_SPREAD
, NULL, NULL);
if (vxfs_inode_cachep)
if (vxfs_inode_cachep)
- return
(register_filesystem(&vxfs_fs_type)
);
+ return
register_filesystem(&vxfs_fs_type
);
return -ENOMEM;
}
return -ENOMEM;
}