Commit 377bcd5f authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong
Browse files

xfs: Remove kmem_zone_free() wrapper 



We can remove it now, without needing to rework the KM_ flags.

Use kmem_cache_free() directly.

Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent aaf54eb8

fs/xfs/kmem.h

+0 −6
Original line number Diff line number Diff line
@@ -81,12 +81,6 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags) 
#define kmem_zone	kmem_cache

#define kmem_zone_t	struct kmem_cache



static inline void

kmem_zone_free(kmem_zone_t *zone, void *ptr)

{

	kmem_cache_free(zone, ptr);

}



extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t);



static inline void *

fs/xfs/libxfs/xfs_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ xfs_btree_del_cursor( 
	/*

	 * Free the cursor.

	 */

	kmem_zone_free(xfs_btree_cur_zone, cur);

	kmem_cache_free(xfs_btree_cur_zone, cur);

}



/*

fs/xfs/libxfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ xfs_da_state_free(xfs_da_state_t *state) 
#ifdef DEBUG

	memset((char *)state, 0, sizeof(*state));

#endif /* DEBUG */

	kmem_zone_free(xfs_da_state_zone, state);

	kmem_cache_free(xfs_da_state_zone, state);

}



void

fs/xfs/libxfs/xfs_inode_fork.c

+4 −4
Original line number Diff line number Diff line
@@ -120,10 +120,10 @@ xfs_iformat_fork( 
		break;

	}

	if (error) {

		kmem_zone_free(xfs_ifork_zone, ip->i_afp);

		kmem_cache_free(xfs_ifork_zone, ip->i_afp);

		ip->i_afp = NULL;

		if (ip->i_cowfp)

			kmem_zone_free(xfs_ifork_zone, ip->i_cowfp);

			kmem_cache_free(xfs_ifork_zone, ip->i_cowfp);

		ip->i_cowfp = NULL;

		xfs_idestroy_fork(ip, XFS_DATA_FORK);

	}
@@ -531,10 +531,10 @@ xfs_idestroy_fork( 
	}



	if (whichfork == XFS_ATTR_FORK) {

		kmem_zone_free(xfs_ifork_zone, ip->i_afp);

		kmem_cache_free(xfs_ifork_zone, ip->i_afp);

		ip->i_afp = NULL;

	} else if (whichfork == XFS_COW_FORK) {

		kmem_zone_free(xfs_ifork_zone, ip->i_cowfp);

		kmem_cache_free(xfs_ifork_zone, ip->i_cowfp);

		ip->i_cowfp = NULL;

	}

}

fs/xfs/xfs_bmap_item.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void 
xfs_bui_item_free(

	struct xfs_bui_log_item	*buip)

{

	kmem_zone_free(xfs_bui_zone, buip);

	kmem_cache_free(xfs_bui_zone, buip);

}



/*
@@ -201,7 +201,7 @@ xfs_bud_item_release( 
	struct xfs_bud_log_item	*budp = BUD_ITEM(lip);



	xfs_bui_release(budp->bud_buip);

	kmem_zone_free(xfs_bud_zone, budp);

	kmem_cache_free(xfs_bud_zone, budp);

}



static const struct xfs_item_ops xfs_bud_item_ops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE