Commit 32a2b11f authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong
Browse files

xfs: Remove kmem_zone_zalloc() usage 



Use kmem_cache_zalloc() directly.

With the exception of xlog_ticket_alloc() which will be dealt on the
next patch for readability.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 3050bd0b

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ xfs_allocbt_init_common( 


	ASSERT(btnum == XFS_BTNUM_BNO || btnum == XFS_BTNUM_CNT);



	cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);

	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);



	cur->bc_tp = tp;

	cur->bc_mp = mp;

fs/xfs/libxfs/xfs_bmap.c

+4 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,10 @@ xfs_bmap_add_attrfork( 
	if (error)

		goto trans_cancel;

	ASSERT(ip->i_afp == NULL);

	ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, 0);



	ip->i_afp = kmem_cache_zalloc(xfs_ifork_zone,

				      GFP_KERNEL | __GFP_NOFAIL);



	ip->i_afp->if_format = XFS_DINODE_FMT_EXTENTS;

	ip->i_afp->if_flags = XFS_IFEXTENTS;

	logflags = 0;

fs/xfs/libxfs/xfs_bmap_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ xfs_bmbt_init_cursor( 
	struct xfs_btree_cur	*cur;

	ASSERT(whichfork != XFS_COW_FORK);



	cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);

	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);



	cur->bc_tp = tp;

	cur->bc_mp = mp;

fs/xfs/libxfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ kmem_zone_t *xfs_da_state_zone; /* anchor for state struct zone */ 
xfs_da_state_t *

xfs_da_state_alloc(void)

{

	return kmem_zone_zalloc(xfs_da_state_zone, KM_NOFS);

	return kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);

}



/*

fs/xfs/libxfs/xfs_ialloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ xfs_inobt_init_common( 
{

	struct xfs_btree_cur	*cur;



	cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);

	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);

	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_btnum = btnum;