diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /fs/freevxfs/vxfs_super.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
| download | kernel-crypto-327309e899662b482c58cf25f574513d38b5788c.tar.gz kernel-crypto-327309e899662b482c58cf25f574513d38b5788c.tar.xz kernel-crypto-327309e899662b482c58cf25f574513d38b5788c.zip | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'fs/freevxfs/vxfs_super.c')
| -rw-r--r-- | fs/freevxfs/vxfs_super.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c index 0ae2c7b8182..27f66d3e8a0 100644 --- 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; - infp = kmalloc(sizeof(*infp), GFP_KERNEL); + infp = kcalloc(1, sizeof(*infp), GFP_KERNEL); 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) { @@ -196,7 +195,7 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent) #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; @@ -263,7 +262,7 @@ vxfs_init(void) sizeof(struct vxfs_inode_info), 0, SLAB_RECLAIM_ACCOUNT, NULL, NULL); if (vxfs_inode_cachep) - return (register_filesystem(&vxfs_fs_type)); + return register_filesystem(&vxfs_fs_type); return -ENOMEM; } |