From: Carlos Maiolino <cmaiolino@redhat.com>
Date: Wed, 22 Jan 2020 16:29:45 +0000 (-0500)
Subject: xfs: Remove kmem_zone_free() wrapper
X-Git-Tag: v5.5.0-rc0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cef0cc3b0f67ecf2ed228a62e01ea9a055079933;p=thirdparty%2Fxfsprogs-dev.git

xfs: Remove kmem_zone_free() wrapper

Source kernel commit: 377bcd5f3b7f46f50fdad1fed639c07f8c9f68cb

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

Use kmem_cache_free() directly.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/include/kmem.h b/include/kmem.h
index 0f48dc686..05ae354a8 100644
--- a/include/kmem.h
+++ b/include/kmem.h
@@ -22,7 +22,7 @@ extern void	*kmem_zone_zalloc(kmem_zone_t *, int);
 extern int	kmem_zone_destroy(kmem_zone_t *);
 
 static inline void
-kmem_zone_free(kmem_zone_t *zone, void *ptr)
+kmem_cache_free(kmem_zone_t *zone, void *ptr)
 {
 	zone->allocated--;
 	free(ptr);
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 3f69192d0..0d9d72022 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1270,7 +1270,7 @@ libxfs_bcache_free(void)
 		free(bp->b_addr);
 		if (bp->b_maps != &bp->__b_map)
 			free(bp->b_maps);
-		kmem_zone_free(xfs_buf_zone, bp);
+		kmem_cache_free(xfs_buf_zone, bp);
 	}
 }
 
@@ -1426,7 +1426,7 @@ libxfs_iget(
 	ip->i_mount = mp;
 	error = xfs_iread(mp, tp, ip, 0);
 	if (error) {
-		kmem_zone_free(xfs_inode_zone, ip);
+		kmem_cache_free(xfs_inode_zone, ip);
 		*ipp = NULL;
 		return error;
 	}
@@ -1471,7 +1471,7 @@ libxfs_irele(
 {
 	ASSERT(ip->i_itemp == NULL);
 	libxfs_idestroy(ip);
-	kmem_zone_free(xfs_inode_zone, ip);
+	kmem_cache_free(xfs_inode_zone, ip);
 }
 
 /*
diff --git a/libxfs/trans.c b/libxfs/trans.c
index 42c2e9e19..18b87d705 100644
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -124,7 +124,7 @@ static void
 xfs_trans_free(
 	struct xfs_trans	*tp)
 {
-	kmem_zone_free(xfs_trans_zone, tp);
+	kmem_cache_free(xfs_trans_zone, tp);
 }
 
 /*
@@ -336,7 +336,7 @@ xfs_buf_item_put(
 	struct xfs_buf		*bp = bip->bli_buf;
 
 	bp->b_log_item = NULL;
-	kmem_zone_free(xfs_buf_item_zone, bip);
+	kmem_cache_free(xfs_buf_item_zone, bip);
 }
 
 /* from xfs_trans_buf.c */
@@ -791,7 +791,7 @@ xfs_inode_item_put(
 	struct xfs_inode		*ip = iip->ili_inode;
 
 	ip->i_itemp = NULL;
-	kmem_zone_free(xfs_ili_zone, iip);
+	kmem_cache_free(xfs_ili_zone, iip);
 }
 
 
diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 9ebf1fb37..08a7e4eba 100644
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -377,7 +377,7 @@ xfs_btree_del_cursor(
 	/*
 	 * Free the cursor.
 	 */
-	kmem_zone_free(xfs_btree_cur_zone, cur);
+	kmem_cache_free(xfs_btree_cur_zone, cur);
 }
 
 /*
diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 5907c8c40..1cf556058 100644
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -104,7 +104,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
diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index 1d726650f..a4b5686e0 100644
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -118,10 +118,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);
 	}
@@ -529,10 +529,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;
 	}
 }