From: Darrick J. Wong <djwong@xxxxxxxxxx>
Remove all three of these helpers now that the kernel has dropped them.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
db/bmap_inflate.c | 2 +-
include/kmem.h | 10 +---------
libxfs/defer_item.c | 2 +-
libxfs/init.c | 2 +-
libxfs/kmem.c | 32 ++++++++++----------------------
libxlog/xfs_log_recover.c | 19 +++++++++----------
repair/bmap_repair.c | 4 ++--
7 files changed, 25 insertions(+), 46 deletions(-)
diff --git a/db/bmap_inflate.c b/db/bmap_inflate.c
index c85d5dc0d64a..00e1aff66567 100644
--- a/db/bmap_inflate.c
+++ b/db/bmap_inflate.c
@@ -327,7 +327,7 @@ populate_btree(
/* Leak any unused blocks */
list_for_each_entry_safe(resv, n, &bd.resv_list, list) {
list_del(&resv->list);
- kmem_free(resv);
+ kfree(resv);
}
return error;
}
diff --git a/include/kmem.h b/include/kmem.h
index 6818a404728f..386b4a6be783 100644
--- a/include/kmem.h
+++ b/include/kmem.h
@@ -50,15 +50,7 @@ kmem_cache_free(struct kmem_cache *cache, void *ptr)
free(ptr);
}
-extern void *kmem_alloc(size_t, int);
extern void *kvmalloc(size_t, gfp_t);
-extern void *kmem_zalloc(size_t, int);
-
-static inline void
-kmem_free(const void *ptr) {
- free((void *)ptr);
-}
-
extern void *krealloc(void *, size_t, int);
static inline void *kmalloc(size_t size, gfp_t flags)
@@ -70,7 +62,7 @@ static inline void *kmalloc(size_t size, gfp_t flags)
static inline void kfree(const void *ptr)
{
- return kmem_free(ptr);
+ free((void *)ptr);
}
#endif
diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c
index d67032c26200..680a72664746 100644
--- a/libxfs/defer_item.c
+++ b/libxfs/defer_item.c
@@ -606,7 +606,7 @@ xfs_attr_free_item(
if (attr->xattri_da_state)
xfs_da_state_free(attr->xattri_da_state);
if (attr->xattri_da_args->op_flags & XFS_DA_OP_RECOVERY)
- kmem_free(attr);
+ kfree(attr);
else
kmem_cache_free(xfs_attr_intent_cache, attr);
}
diff --git a/libxfs/init.c b/libxfs/init.c
index f5cd85655cf0..d0478960278a 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -893,7 +893,7 @@ libxfs_buftarg_free(
struct xfs_buftarg *btp)
{
cache_destroy(btp->bcache);
- kmem_free(btp);
+ kfree(btp);
}
/*
diff --git a/libxfs/kmem.c b/libxfs/kmem.c
index c264be018bdc..a2a3935d00e8 100644
--- a/libxfs/kmem.c
+++ b/libxfs/kmem.c
@@ -65,33 +65,21 @@ kmem_cache_zalloc(struct kmem_cache *cache, gfp_t flags)
return ptr;
}
-void *
-kmem_alloc(size_t size, int flags)
-{
- void *ptr = malloc(size);
-
- if (ptr == NULL) {
- fprintf(stderr, _("%s: malloc failed (%d bytes): %s\n"),
- progname, (int)size, strerror(errno));
- exit(1);
- }
- return ptr;
-}
-
void *
kvmalloc(size_t size, gfp_t flags)
{
+ void *ptr;
+
if (flags & __GFP_ZERO)
- return kmem_zalloc(size, 0);
- return kmem_alloc(size, 0);
-}
+ ptr = calloc(1, size);
+ else
+ ptr = malloc(size);
-void *
-kmem_zalloc(size_t size, int flags)
-{
- void *ptr = kmem_alloc(size, flags);
-
- memset(ptr, 0, size);
+ if (ptr == NULL) {
+ fprintf(stderr, _("%s: malloc failed (%d bytes): %s\n"),
+ progname, (int)size, strerror(errno));
+ exit(1);
+ }
return ptr;
}
diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index 99f759d5cb03..31b11fee9e47 100644
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -991,7 +991,7 @@ xlog_recover_new_tid(
{
struct xlog_recover *trans;
- trans = kmem_zalloc(sizeof(struct xlog_recover), 0);
+ trans = kzalloc(sizeof(struct xlog_recover), 0);
trans->r_log_tid = tid;
trans->r_lsn = lsn;
INIT_LIST_HEAD(&trans->r_itemq);
@@ -1006,7 +1006,7 @@ xlog_recover_add_item(
{
struct xlog_recover_item *item;
- item = kmem_zalloc(sizeof(struct xlog_recover_item), 0);
+ item = kzalloc(sizeof(struct xlog_recover_item), 0);
INIT_LIST_HEAD(&item->ri_list);
list_add_tail(&item->ri_list, head);
}
@@ -1085,7 +1085,7 @@ xlog_recover_add_to_trans(
return 0;
}
- ptr = kmem_alloc(len, 0);
+ ptr = kmalloc(len, 0);
memcpy(ptr, dp, len);
in_f = (struct xfs_inode_log_format *)ptr;
@@ -1107,13 +1107,12 @@ xlog_recover_add_to_trans(
"bad number of regions (%d) in inode log format",
in_f->ilf_size);
ASSERT(0);
- kmem_free(ptr);
+ kfree(ptr);
return XFS_ERROR(EIO);
}
item->ri_total = in_f->ilf_size;
- item->ri_buf =
- kmem_zalloc(item->ri_total * sizeof(xfs_log_iovec_t),
+ item->ri_buf = kzalloc(item->ri_total * sizeof(xfs_log_iovec_t),
0);
}
ASSERT(item->ri_total > item->ri_cnt);
@@ -1141,13 +1140,13 @@ xlog_recover_free_trans(
/* Free the regions in the item. */
list_del(&item->ri_list);
for (i = 0; i < item->ri_cnt; i++)
- kmem_free(item->ri_buf[i].i_addr);
+ kfree(item->ri_buf[i].i_addr);
/* Free the item itself */
- kmem_free(item->ri_buf);
- kmem_free(item);
+ kfree(item->ri_buf);
+ kfree(item);
}
/* Free the transaction recover structure */
- kmem_free(trans);
+ kfree(trans);
}
/*
diff --git a/repair/bmap_repair.c b/repair/bmap_repair.c
index 845584f18450..317061aa564f 100644
--- a/repair/bmap_repair.c
+++ b/repair/bmap_repair.c
@@ -595,7 +595,7 @@ xrep_bmap(
if (error)
return error;
- rb = kmem_zalloc(sizeof(struct xrep_bmap), KM_NOFS | KM_MAYFAIL);
+ rb = kzalloc(sizeof(struct xrep_bmap), 0);
if (!rb)
return ENOMEM;
rb->sc = sc;
@@ -622,7 +622,7 @@ xrep_bmap(
out_bitmap:
free_slab(&rb->bmap_records);
out_rb:
- kmem_free(rb);
+ kfree(rb);
return error;
}
