xfs: convert remaining kmem_free() to kfree()
authorDave Chinner <dchinner@redhat.com>
Mon, 15 Jan 2024 22:59:43 +0000 (09:59 +1100)
committerChandan Babu R <chandanbabu@kernel.org>
Tue, 13 Feb 2024 12:37:34 +0000 (18:07 +0530)
The remaining callers of kmem_free() are freeing heap memory, so
we can convert them directly to kfree() and get rid of kmem_free()
altogether.

This conversion was done with:

$ for f in `git grep -l kmem_free fs/xfs`; do
> sed -i s/kmem_free/kfree/ $f
> done
$

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
41 files changed:
fs/xfs/kmem.h [deleted file]
fs/xfs/libxfs/xfs_ag.c
fs/xfs/libxfs/xfs_attr_leaf.c
fs/xfs/libxfs/xfs_btree.c
fs/xfs/libxfs/xfs_btree_staging.c
fs/xfs/libxfs/xfs_da_btree.c
fs/xfs/libxfs/xfs_defer.c
fs/xfs/libxfs/xfs_dir2.c
fs/xfs/libxfs/xfs_dir2_block.c
fs/xfs/libxfs/xfs_dir2_sf.c
fs/xfs/libxfs/xfs_iext_tree.c
fs/xfs/libxfs/xfs_inode_fork.c
fs/xfs/scrub/cow_repair.c
fs/xfs/xfs_attr_item.c
fs/xfs/xfs_attr_list.c
fs/xfs/xfs_buf.c
fs/xfs/xfs_buf_item.c
fs/xfs/xfs_buf_item_recover.c
fs/xfs/xfs_discard.c
fs/xfs/xfs_error.c
fs/xfs/xfs_extent_busy.c
fs/xfs/xfs_extfree_item.c
fs/xfs/xfs_filestream.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode_item_recover.c
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_iops.c
fs/xfs/xfs_itable.c
fs/xfs/xfs_iwalk.c
fs/xfs/xfs_linux.h
fs/xfs/xfs_log.c
fs/xfs/xfs_log_cil.c
fs/xfs/xfs_log_recover.c
fs/xfs/xfs_mount.c
fs/xfs/xfs_mru_cache.c
fs/xfs/xfs_qm.c
fs/xfs/xfs_refcount_item.c
fs/xfs/xfs_rmap_item.c
fs/xfs/xfs_rtalloc.c
fs/xfs/xfs_super.c
fs/xfs/xfs_trans_ail.c

diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
deleted file mode 100644 (file)
index 48e43f2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.
- * All Rights Reserved.
- */
-#ifndef __XFS_SUPPORT_KMEM_H__
-#define __XFS_SUPPORT_KMEM_H__
-
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-
-/*
- * General memory allocation interfaces
- */
-
-static inline void  kmem_free(const void *ptr)
-{
-       kvfree(ptr);
-}
-
-#endif /* __XFS_SUPPORT_KMEM_H__ */
index 96a6bfd58931674ba3b0745020c87cdf1a175d8d..937ea48d5cc0b27e6e49e78a9cf7514ea30c8082 100644 (file)
@@ -241,7 +241,7 @@ __xfs_free_perag(
        struct xfs_perag *pag = container_of(head, struct xfs_perag, rcu_head);
 
        ASSERT(!delayed_work_pending(&pag->pag_blockgc_work));
-       kmem_free(pag);
+       kfree(pag);
 }
 
 /*
@@ -353,7 +353,7 @@ xfs_free_unused_perag_range(
                        break;
                xfs_buf_hash_destroy(pag);
                xfs_defer_drain_free(&pag->pag_intents_drain);
-               kmem_free(pag);
+               kfree(pag);
        }
 }
 
@@ -453,7 +453,7 @@ out_remove_pag:
        radix_tree_delete(&mp->m_perag_tree, index);
        spin_unlock(&mp->m_perag_lock);
 out_free_pag:
-       kmem_free(pag);
+       kfree(pag);
 out_unwind_new_pags:
        /* unwind any prior newly initialized pags */
        xfs_free_unused_perag_range(mp, first_initialised, agcount);
index 033382cf514dadff5b4a5c70f1a0526cc3676f0b..192d9938a231b9c203a62746b1eee4da55ff8900 100644 (file)
@@ -923,7 +923,7 @@ xfs_attr_shortform_to_leaf(
        }
        error = 0;
 out:
-       kmem_free(tmpbuffer);
+       kfree(tmpbuffer);
        return error;
 }
 
@@ -1124,7 +1124,7 @@ xfs_attr3_leaf_to_shortform(
        error = 0;
 
 out:
-       kmem_free(tmpbuffer);
+       kfree(tmpbuffer);
        return error;
 }
 
@@ -1570,7 +1570,7 @@ xfs_attr3_leaf_compact(
         */
        xfs_trans_log_buf(trans, bp, 0, args->geo->blksize - 1);
 
-       kmem_free(tmpbuffer);
+       kfree(tmpbuffer);
 }
 
 /*
@@ -2290,7 +2290,7 @@ xfs_attr3_leaf_unbalance(
                }
                memcpy(save_leaf, tmp_leaf, state->args->geo->blksize);
                savehdr = tmphdr; /* struct copy */
-               kmem_free(tmp_leaf);
+               kfree(tmp_leaf);
        }
 
        xfs_attr3_leaf_hdr_to_disk(state->args->geo, save_leaf, &savehdr);
index ea8d3659df208eff6f703b0591b5f2eb1f91396f..1adfc35c99c90af4a363525a811b8840e5548c2f 100644 (file)
@@ -451,7 +451,7 @@ xfs_btree_del_cursor(
        ASSERT(cur->bc_btnum != XFS_BTNUM_BMAP || cur->bc_ino.allocated == 0 ||
               xfs_is_shutdown(cur->bc_mp) || error != 0);
        if (unlikely(cur->bc_flags & XFS_BTREE_STAGING))
-               kmem_free(cur->bc_ops);
+               kfree(cur->bc_ops);
        if (!(cur->bc_flags & XFS_BTREE_LONG_PTRS) && cur->bc_ag.pag)
                xfs_perag_put(cur->bc_ag.pag);
        kmem_cache_free(cur->bc_cache, cur);
index 065e4a00a2f4fa298935030c0b7fb449bd5239c0..961f6b898f4b2f85333de3a748688ef46bc07c82 100644 (file)
@@ -171,7 +171,7 @@ xfs_btree_commit_afakeroot(
 
        trace_xfs_btree_commit_afakeroot(cur);
 
-       kmem_free((void *)cur->bc_ops);
+       kfree((void *)cur->bc_ops);
        cur->bc_ag.agbp = agbp;
        cur->bc_ops = ops;
        cur->bc_flags &= ~XFS_BTREE_STAGING;
@@ -254,7 +254,7 @@ xfs_btree_commit_ifakeroot(
 
        trace_xfs_btree_commit_ifakeroot(cur);
 
-       kmem_free((void *)cur->bc_ops);
+       kfree((void *)cur->bc_ops);
        cur->bc_ino.ifake = NULL;
        cur->bc_ino.whichfork = whichfork;
        cur->bc_ops = ops;
index 331b9251b1857496ecbb509034796b51a6a685cc..3383b4525381d2ba005cbf087c7537930f3b53d6 100644 (file)
@@ -2220,7 +2220,7 @@ xfs_da_grow_inode_int(
 
 out_free_map:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
        return error;
 }
 
@@ -2559,7 +2559,7 @@ xfs_dabuf_map(
        *nmaps = nirecs;
 out_free_irecs:
        if (irecs != &irec)
-               kmem_free(irecs);
+               kfree(irecs);
        return error;
 
 invalid_mapping:
@@ -2615,7 +2615,7 @@ xfs_da_get_buf(
 
 out_free:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
 
        return error;
 }
@@ -2656,7 +2656,7 @@ xfs_da_read_buf(
        *bpp = bp;
 out_free:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
 
        return error;
 }
@@ -2687,7 +2687,7 @@ xfs_da_reada_buf(
 
 out_free:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
 
        return error;
 }
index 07d318b1f807a6c7e36a9f883bdf2d85a2b9628c..75689c151a54d81b3c00212714e0675a4f2f2519 100644 (file)
@@ -1038,7 +1038,7 @@ xfs_defer_ops_capture_abort(
        for (i = 0; i < dfc->dfc_held.dr_inos; i++)
                xfs_irele(dfc->dfc_held.dr_ip[i]);
 
-       kmem_free(dfc);
+       kfree(dfc);
 }
 
 /*
@@ -1114,7 +1114,7 @@ xfs_defer_ops_continue(
        list_splice_init(&dfc->dfc_dfops, &tp->t_dfops);
        tp->t_flags |= dfc->dfc_tpflags;
 
-       kmem_free(dfc);
+       kfree(dfc);
 }
 
 /* Release the resources captured and continued during recovery. */
index 370d673004553e7ac2be6754af85bb13b89ea2e2..e60aa8f8d0a79d712a2c5eebfd77839d72d9a910 100644 (file)
@@ -109,8 +109,8 @@ xfs_da_mount(
        mp->m_attr_geo = kzalloc(sizeof(struct xfs_da_geometry),
                                GFP_KERNEL | __GFP_RETRY_MAYFAIL);
        if (!mp->m_dir_geo || !mp->m_attr_geo) {
-               kmem_free(mp->m_dir_geo);
-               kmem_free(mp->m_attr_geo);
+               kfree(mp->m_dir_geo);
+               kfree(mp->m_attr_geo);
                return -ENOMEM;
        }
 
@@ -178,8 +178,8 @@ void
 xfs_da_unmount(
        struct xfs_mount        *mp)
 {
-       kmem_free(mp->m_dir_geo);
-       kmem_free(mp->m_attr_geo);
+       kfree(mp->m_dir_geo);
+       kfree(mp->m_attr_geo);
 }
 
 /*
@@ -244,7 +244,7 @@ xfs_dir_init(
        args->dp = dp;
        args->trans = tp;
        error = xfs_dir2_sf_create(args, pdp->i_ino);
-       kmem_free(args);
+       kfree(args);
        return error;
 }
 
@@ -313,7 +313,7 @@ xfs_dir_createname(
                rval = xfs_dir2_node_addname(args);
 
 out_free:
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 
@@ -419,7 +419,7 @@ out_check_rval:
        }
 out_free:
        xfs_iunlock(dp, lock_mode);
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 
@@ -477,7 +477,7 @@ xfs_dir_removename(
        else
                rval = xfs_dir2_node_removename(args);
 out_free:
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 
@@ -538,7 +538,7 @@ xfs_dir_replace(
        else
                rval = xfs_dir2_node_replace(args);
 out_free:
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 
index 506c65caaec5d0a1550fdae78c340e2e5e924e4c..fde46081a8246c525514a905cef0ee91de16bd26 100644 (file)
@@ -1253,7 +1253,7 @@ xfs_dir2_sf_to_block(
                        sfep = xfs_dir2_sf_nextentry(mp, sfp, sfep);
        }
        /* Done with the temporary buffer */
-       kmem_free(sfp);
+       kfree(sfp);
        /*
         * Sort the leaf entries by hash value.
         */
@@ -1268,6 +1268,6 @@ xfs_dir2_sf_to_block(
        xfs_dir3_data_check(dp, bp);
        return 0;
 out_free:
-       kmem_free(sfp);
+       kfree(sfp);
        return error;
 }
index 7b1f41cff9e093ae28e06ca09d0ddd021f0f05e0..17a20384c8b7195350f3db6ae5926e98b3086a1b 100644 (file)
@@ -350,7 +350,7 @@ xfs_dir2_block_to_sf(
        xfs_dir2_sf_check(args);
 out:
        xfs_trans_log_inode(args->trans, dp, logflags);
-       kmem_free(sfp);
+       kfree(sfp);
        return error;
 }
 
@@ -576,7 +576,7 @@ xfs_dir2_sf_addname_hard(
                sfep = xfs_dir2_sf_nextentry(mp, sfp, sfep);
                memcpy(sfep, oldsfep, old_isize - nbytes);
        }
-       kmem_free(buf);
+       kfree(buf);
        dp->i_disk_size = new_isize;
        xfs_dir2_sf_check(args);
 }
@@ -1190,7 +1190,7 @@ xfs_dir2_sf_toino4(
        /*
         * Clean up the inode.
         */
-       kmem_free(buf);
+       kfree(buf);
        dp->i_disk_size = newsize;
        xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA);
 }
@@ -1262,7 +1262,7 @@ xfs_dir2_sf_toino8(
        /*
         * Clean up the inode.
         */
-       kmem_free(buf);
+       kfree(buf);
        dp->i_disk_size = newsize;
        xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA);
 }
index 4522f3c7a23f311f3961c760fd5c035e36f3acf0..16f18b08fe4cf247166538539f58a869070cf522 100644 (file)
@@ -747,7 +747,7 @@ xfs_iext_remove_node(
 again:
        ASSERT(node->ptrs[pos]);
        ASSERT(node->ptrs[pos] == victim);
-       kmem_free(victim);
+       kfree(victim);
 
        nr_entries = xfs_iext_node_nr_entries(node, pos) - 1;
        offset = node->keys[0];
@@ -793,7 +793,7 @@ again:
                ASSERT(node == ifp->if_data);
                ifp->if_data = node->ptrs[0];
                ifp->if_height--;
-               kmem_free(node);
+               kfree(node);
        }
 }
 
@@ -867,7 +867,7 @@ xfs_iext_free_last_leaf(
        struct xfs_ifork        *ifp)
 {
        ifp->if_height--;
-       kmem_free(ifp->if_data);
+       kfree(ifp->if_data);
        ifp->if_data = NULL;
 }
 
@@ -1048,7 +1048,7 @@ xfs_iext_destroy_node(
                }
        }
 
-       kmem_free(node);
+       kfree(node);
 }
 
 void
index f3cf7f933e1520db1f6069b360aeb4206bcad9e8..f6d5b86b608da8ca0dce0d43823b328566cb2ef7 100644 (file)
@@ -471,7 +471,7 @@ xfs_iroot_realloc(
                                                     (int)new_size);
                memcpy(np, op, new_max * (uint)sizeof(xfs_fsblock_t));
        }
-       kmem_free(ifp->if_broot);
+       kfree(ifp->if_broot);
        ifp->if_broot = new_broot;
        ifp->if_broot_bytes = (int)new_size;
        if (ifp->if_broot)
@@ -525,13 +525,13 @@ xfs_idestroy_fork(
        struct xfs_ifork        *ifp)
 {
        if (ifp->if_broot != NULL) {
-               kmem_free(ifp->if_broot);
+               kfree(ifp->if_broot);
                ifp->if_broot = NULL;
        }
 
        switch (ifp->if_format) {
        case XFS_DINODE_FMT_LOCAL:
-               kmem_free(ifp->if_data);
+               kfree(ifp->if_data);
                ifp->if_data = NULL;
                break;
        case XFS_DINODE_FMT_EXTENTS:
index 1e82c727af8ed52e427a6060ecb2cbdb1b328c31..4de3f0f40f486c887c2b8787dd8d17fe40f328ed 100644 (file)
@@ -609,6 +609,6 @@ xrep_bmap_cow(
 out_bitmap:
        xfsb_bitmap_destroy(&xc->old_cowfork_fsblocks);
        xoff_bitmap_destroy(&xc->bad_fileoffs);
-       kmem_free(xc);
+       kfree(xc);
        return error;
 }
index f7ba80d575d444fd6d51cb5fd3b9d42f44586ae1..2a142cefdc3db86fadfe464779aff64300e939d2 100644 (file)
@@ -386,7 +386,7 @@ xfs_attr_free_item(
                xfs_da_state_free(attr->xattri_da_state);
        xfs_attri_log_nameval_put(attr->xattri_nameval);
        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);
 }
index 5f7a44d21cc9dee316c3341286085d759f816ab2..0318d768520a8261bfa7de1937b07d8e8792dd93 100644 (file)
@@ -124,7 +124,7 @@ xfs_attr_shortform_list(
                                             XFS_ERRLEVEL_LOW,
                                             context->dp->i_mount, sfe,
                                             sizeof(*sfe));
-                       kmem_free(sbuf);
+                       kfree(sbuf);
                        return -EFSCORRUPTED;
                }
 
@@ -188,7 +188,7 @@ xfs_attr_shortform_list(
                cursor->offset++;
        }
 out:
-       kmem_free(sbuf);
+       kfree(sbuf);
        return error;
 }
 
index 6f53eb2d3de019927e2178c41c744ad8b6be9e5b..10bbde3ce7cc08c350ab44c8ac89a6388d26a7ea 100644 (file)
@@ -204,7 +204,7 @@ xfs_buf_free_maps(
        struct xfs_buf  *bp)
 {
        if (bp->b_maps != &bp->__b_map) {
-               kmem_free(bp->b_maps);
+               kfree(bp->b_maps);
                bp->b_maps = NULL;
        }
 }
@@ -289,7 +289,7 @@ xfs_buf_free_pages(
        mm_account_reclaimed_pages(bp->b_page_count);
 
        if (bp->b_pages != bp->b_page_array)
-               kmem_free(bp->b_pages);
+               kfree(bp->b_pages);
        bp->b_pages = NULL;
        bp->b_flags &= ~_XBF_PAGES;
 }
@@ -315,7 +315,7 @@ xfs_buf_free(
        if (bp->b_flags & _XBF_PAGES)
                xfs_buf_free_pages(bp);
        else if (bp->b_flags & _XBF_KMEM)
-               kmem_free(bp->b_addr);
+               kfree(bp->b_addr);
 
        call_rcu(&bp->b_rcu, xfs_buf_free_callback);
 }
@@ -339,7 +339,7 @@ xfs_buf_alloc_kmem(
        if (((unsigned long)(bp->b_addr + size - 1) & PAGE_MASK) !=
            ((unsigned long)bp->b_addr & PAGE_MASK)) {
                /* b_addr spans two pages - use alloc_page instead */
-               kmem_free(bp->b_addr);
+               kfree(bp->b_addr);
                bp->b_addr = NULL;
                return -ENOMEM;
        }
@@ -1953,7 +1953,7 @@ xfs_free_buftarg(
        if (btp->bt_bdev != btp->bt_mount->m_super->s_bdev)
                bdev_release(btp->bt_bdev_handle);
 
-       kmem_free(btp);
+       kfree(btp);
 }
 
 int
@@ -2045,7 +2045,7 @@ error_pcpu:
 error_lru:
        list_lru_destroy(&btp->bt_lru);
 error_free:
-       kmem_free(btp);
+       kfree(btp);
        return NULL;
 }
 
index 545040c6ae876c0e9fce13da7635a873be8af48d..43031842341a207d0c138b3e18b42b06122e0054 100644 (file)
@@ -814,7 +814,7 @@ xfs_buf_item_free_format(
        struct xfs_buf_log_item *bip)
 {
        if (bip->bli_formats != &bip->__bli_format) {
-               kmem_free(bip->bli_formats);
+               kfree(bip->bli_formats);
                bip->bli_formats = NULL;
        }
 }
index 34776f4c05acc796feade8dec560696cfb08dc7c..09e893cf563cb98e740609743db74523148ee2c5 100644 (file)
@@ -129,7 +129,7 @@ xlog_put_buffer_cancelled(
 
        if (--bcp->bc_refcount == 0) {
                list_del(&bcp->bc_list);
-               kmem_free(bcp);
+               kfree(bcp);
        }
        return true;
 }
@@ -1062,10 +1062,10 @@ xlog_free_buf_cancel_table(
                                &log->l_buf_cancel_table[i],
                                struct xfs_buf_cancel, bc_list))) {
                        list_del(&bc->bc_list);
-                       kmem_free(bc);
+                       kfree(bc);
                }
        }
 
-       kmem_free(log->l_buf_cancel_table);
+       kfree(log->l_buf_cancel_table);
        log->l_buf_cancel_table = NULL;
 }
index d5787991bb5b46477419074e1015ba1135945c7b..8539f5c9a77447a8cd17f5b9be44c953a2788d41 100644 (file)
@@ -79,7 +79,7 @@ xfs_discard_endio_work(
                container_of(work, struct xfs_busy_extents, endio_work);
 
        xfs_extent_busy_clear(extents->mount, &extents->extent_list, false);
-       kmem_free(extents->owner);
+       kfree(extents->owner);
 }
 
 /*
index 456520d60cd08beb605e7157e3c75a85a4292239..7ad0e92c6b5b877d4f139f9d25b704e958a21900 100644 (file)
@@ -248,7 +248,7 @@ xfs_errortag_init(
        ret = xfs_sysfs_init(&mp->m_errortag_kobj, &xfs_errortag_ktype,
                                &mp->m_kobj, "errortag");
        if (ret)
-               kmem_free(mp->m_errortag);
+               kfree(mp->m_errortag);
        return ret;
 }
 
@@ -257,7 +257,7 @@ xfs_errortag_del(
        struct xfs_mount        *mp)
 {
        xfs_sysfs_del(&mp->m_errortag_kobj);
-       kmem_free(mp->m_errortag);
+       kfree(mp->m_errortag);
 }
 
 static bool
index b90c3dd43e03d0820e81b237251d0f2827b6a3e8..56cfa1498571e3df52bf0f1b2fa3357c5d9a6eac 100644 (file)
@@ -531,7 +531,7 @@ xfs_extent_busy_clear_one(
        }
 
        list_del_init(&busyp->list);
-       kmem_free(busyp);
+       kfree(busyp);
 }
 
 static void
index 6062703a272350ee952f2d3ce4477b3ebaf7dbbf..8c382f092332c1dc59303b8cc631a5de0478e3ef 100644 (file)
@@ -42,7 +42,7 @@ xfs_efi_item_free(
 {
        kvfree(efip->efi_item.li_lv_shadow);
        if (efip->efi_format.efi_nextents > XFS_EFI_MAX_FAST_EXTENTS)
-               kmem_free(efip);
+               kfree(efip);
        else
                kmem_cache_free(xfs_efi_cache, efip);
 }
@@ -231,7 +231,7 @@ xfs_efd_item_free(struct xfs_efd_log_item *efdp)
 {
        kvfree(efdp->efd_item.li_lv_shadow);
        if (efdp->efd_format.efd_nextents > XFS_EFD_MAX_FAST_EXTENTS)
-               kmem_free(efdp);
+               kfree(efdp);
        else
                kmem_cache_free(xfs_efd_cache, efdp);
 }
index e2a3c8d3fe4f9860c83760a554063785c8757fda..e3aaa055559781b3a77cf7acfb81ca6c54094700 100644 (file)
@@ -44,7 +44,7 @@ xfs_fstrm_free_func(
        atomic_dec(&pag->pagf_fstrms);
        xfs_perag_rele(pag);
 
-       kmem_free(item);
+       kfree(item);
 }
 
 /*
@@ -326,7 +326,7 @@ xfs_filestream_create_association(
 
 out_free_item:
        xfs_perag_rele(item->pag);
-       kmem_free(item);
+       kfree(item);
 out_put_fstrms:
        atomic_dec(&args->pag->pagf_fstrms);
        return 0;
index 1fd94958aa97aa09d6297bd68f5d6ba38c03d440..37ec247edc133253c9d15a291f0f7e633f20e898 100644 (file)
@@ -671,7 +671,7 @@ xfs_lookup(
 
 out_free_name:
        if (ci_name)
-               kmem_free(ci_name->name);
+               kfree(ci_name->name);
 out_unlock:
        *ipp = NULL;
        return error;
@@ -2378,7 +2378,7 @@ xfs_ifree(
         * already been freed by xfs_attr_inactive.
         */
        if (ip->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
-               kmem_free(ip->i_df.if_data);
+               kfree(ip->i_df.if_data);
                ip->i_df.if_data = NULL;
                ip->i_df.if_bytes = 0;
        }
index 5d7b937179a0b9fba57e0326c8ef95275f684fa0..dbdab4ce7c44c484e32099594d6b5cb29ec679b0 100644 (file)
@@ -554,7 +554,7 @@ out_release:
        xfs_buf_relse(bp);
 error:
        if (need_free)
-               kmem_free(in_f);
+               kfree(in_f);
        return error;
 }
 
index 45fb169bd81992fbe1c092bd4a4991723698b490..7eeebcb6b9250bb85fcb36988951a78a546123fc 100644 (file)
@@ -435,7 +435,7 @@ xfs_ioc_attr_list(
            copy_to_user(ucursor, &context.cursor, sizeof(context.cursor)))
                error = -EFAULT;
 out_free:
-       kmem_free(buffer);
+       kfree(buffer);
        return error;
 }
 
@@ -1506,7 +1506,7 @@ xfs_ioc_getbmap(
 
        error = 0;
 out_free_buf:
-       kmem_free(buf);
+       kfree(buf);
        return error;
 }
 
@@ -1636,7 +1636,7 @@ xfs_ioc_getfsmap(
        }
 
 out_free:
-       kmem_free(recs);
+       kfree(recs);
        return error;
 }
 
index a0d77f5f512e2412c0e4c89aefacdd5c7c52c00c..be102fd49560dc7c121d732122597eb586c56ef6 100644 (file)
@@ -346,7 +346,7 @@ xfs_vn_ci_lookup(
        dname.name = ci_name.name;
        dname.len = ci_name.len;
        dentry = d_add_ci(dentry, VFS_I(ip), &dname);
-       kmem_free(ci_name.name);
+       kfree(ci_name.name);
        return dentry;
 }
 
index 14211174267a4939ead66a713b49358537f13943..95fc31b9f87d6236967569201ada8e3e25415927 100644 (file)
@@ -214,7 +214,7 @@ xfs_bulkstat_one(
                        breq->startino, &bc);
        xfs_trans_cancel(tp);
 out:
-       kmem_free(bc.buf);
+       kfree(bc.buf);
 
        /*
         * If we reported one inode to userspace then we abort because we hit
@@ -309,7 +309,7 @@ xfs_bulkstat(
                        xfs_bulkstat_iwalk, breq->icount, &bc);
        xfs_trans_cancel(tp);
 out:
-       kmem_free(bc.buf);
+       kfree(bc.buf);
 
        /*
         * We found some inodes, so clear the error status and return them.
index 5dd622aa54c5dcdd77c18ecafefb3c30829b9802..6d2eb63648675e019b85b9c03d38f19bc4c8d054 100644 (file)
@@ -172,7 +172,7 @@ STATIC void
 xfs_iwalk_free(
        struct xfs_iwalk_ag     *iwag)
 {
-       kmem_free(iwag->recs);
+       kfree(iwag->recs);
        iwag->recs = NULL;
 }
 
@@ -627,7 +627,7 @@ xfs_iwalk_ag_work(
        xfs_iwalk_free(iwag);
 out:
        xfs_perag_put(iwag->pag);
-       kmem_free(iwag);
+       kfree(iwag);
        return error;
 }
 
index 666618b463c9de00e992b66e32ea1e77881a2f42..caccb7f76690d1306063be14007dfc2e3aadaff2 100644 (file)
@@ -20,8 +20,6 @@ typedef __u32                 xfs_dev_t;
 typedef __u32                  xfs_nlink_t;
 
 #include "xfs_types.h"
-
-#include "kmem.h"
 #include "mrlock.h"
 
 #include <linux/semaphore.h>
@@ -30,6 +28,7 @@ typedef __u32                 xfs_nlink_t;
 #include <linux/kernel.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>
+#include <linux/vmalloc.h>
 #include <linux/crc32c.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
index 0009ffbec932538e80a945fccefa5789ca2546cc..ee39639bb92b9a6ead5b2a1a0be4cd80c0c01292 100644 (file)
@@ -1663,12 +1663,12 @@ out_free_iclog:
        for (iclog = log->l_iclog; iclog; iclog = prev_iclog) {
                prev_iclog = iclog->ic_next;
                kvfree(iclog->ic_data);
-               kmem_free(iclog);
+               kfree(iclog);
                if (prev_iclog == log->l_iclog)
                        break;
        }
 out_free_log:
-       kmem_free(log);
+       kfree(log);
 out:
        return ERR_PTR(error);
 }      /* xlog_alloc_log */
@@ -2120,13 +2120,13 @@ xlog_dealloc_log(
        for (i = 0; i < log->l_iclog_bufs; i++) {
                next_iclog = iclog->ic_next;
                kvfree(iclog->ic_data);
-               kmem_free(iclog);
+               kfree(iclog);
                iclog = next_iclog;
        }
 
        log->l_mp->m_log = NULL;
        destroy_workqueue(log->l_ioend_workqueue);
-       kmem_free(log);
+       kfree(log);
 }
 
 /*
index 2c0512916cc9b84920b1f283a7f54a3d26bf9f5c..815a2181004c6364e10a6f95a2f9219a95192e60 100644 (file)
@@ -703,7 +703,7 @@ xlog_cil_free_logvec(
        while (!list_empty(lv_chain)) {
                lv = list_first_entry(lv_chain, struct xfs_log_vec, lv_list);
                list_del_init(&lv->lv_list);
-               kmem_free(lv);
+               kfree(lv);
        }
 }
 
@@ -753,7 +753,7 @@ xlog_cil_committed(
                return;
        }
 
-       kmem_free(ctx);
+       kfree(ctx);
 }
 
 void
@@ -1339,7 +1339,7 @@ xlog_cil_push_work(
 out_skip:
        up_write(&cil->xc_ctx_lock);
        xfs_log_ticket_put(new_ctx->ticket);
-       kmem_free(new_ctx);
+       kfree(new_ctx);
        return;
 
 out_abort_free_ticket:
@@ -1533,7 +1533,7 @@ xlog_cil_process_intents(
                set_bit(XFS_LI_WHITEOUT, &ilip->li_flags);
                trace_xfs_cil_whiteout_mark(ilip);
                len += ilip->li_lv->lv_bytes;
-               kmem_free(ilip->li_lv);
+               kfree(ilip->li_lv);
                ilip->li_lv = NULL;
 
                xfs_trans_del_item(lip);
@@ -1786,7 +1786,7 @@ xlog_cil_init(
 out_destroy_wq:
        destroy_workqueue(cil->xc_push_wq);
 out_destroy_cil:
-       kmem_free(cil);
+       kfree(cil);
        return -ENOMEM;
 }
 
@@ -1799,12 +1799,12 @@ xlog_cil_destroy(
        if (cil->xc_ctx) {
                if (cil->xc_ctx->ticket)
                        xfs_log_ticket_put(cil->xc_ctx->ticket);
-               kmem_free(cil->xc_ctx);
+               kfree(cil->xc_ctx);
        }
 
        ASSERT(test_bit(XLOG_CIL_EMPTY, &cil->xc_flags));
        free_percpu(cil->xc_pcp);
        destroy_workqueue(cil->xc_push_wq);
-       kmem_free(cil);
+       kfree(cil);
 }
 
index 295306ef6959b5c1793d142469204661c3dc5e7c..e9ed43a833af04c4da7db29b6ea6493cc0bf190d 100644 (file)
@@ -2229,11 +2229,11 @@ xlog_recover_free_trans(
                for (i = 0; i < item->ri_cnt; i++)
                        kvfree(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);
 }
 
 /*
index aabb25dc3efab2ed57e8e1a99ec1aa0bfd503297..7328034d42ed8dacb2dedfb34b7da43c20fed8b9 100644 (file)
@@ -45,7 +45,7 @@ xfs_uuid_table_free(void)
 {
        if (xfs_uuid_table_size == 0)
                return;
-       kmem_free(xfs_uuid_table);
+       kfree(xfs_uuid_table);
        xfs_uuid_table = NULL;
        xfs_uuid_table_size = 0;
 }
index feae3115617ba0fff4620bba0e32adcbfcb030e3..ce496704748de45d4ecaeea8a654129173ff77d8 100644 (file)
@@ -365,9 +365,9 @@ xfs_mru_cache_create(
 
 exit:
        if (err && mru && mru->lists)
-               kmem_free(mru->lists);
+               kfree(mru->lists);
        if (err && mru)
-               kmem_free(mru);
+               kfree(mru);
 
        return err;
 }
@@ -407,8 +407,8 @@ xfs_mru_cache_destroy(
 
        xfs_mru_cache_flush(mru);
 
-       kmem_free(mru->lists);
-       kmem_free(mru);
+       kfree(mru->lists);
+       kfree(mru);
 }
 
 /*
index 6b6b964544490429dea601c39552d7aa3ff665a6..6ad558ae853af71af8343780c216a0623b1cbffb 100644 (file)
@@ -701,7 +701,7 @@ out_free_inos:
 out_free_lru:
        list_lru_destroy(&qinf->qi_lru);
 out_free_qinf:
-       kmem_free(qinf);
+       kfree(qinf);
        mp->m_quotainfo = NULL;
        return error;
 }
@@ -725,7 +725,7 @@ xfs_qm_destroy_quotainfo(
        xfs_qm_destroy_quotainos(qi);
        mutex_destroy(&qi->qi_tree_lock);
        mutex_destroy(&qi->qi_quotaofflock);
-       kmem_free(qi);
+       kfree(qi);
        mp->m_quotainfo = NULL;
 }
 
@@ -1060,7 +1060,7 @@ xfs_qm_reset_dqcounts_buf(
        } while (nmaps > 0);
 
 out:
-       kmem_free(map);
+       kfree(map);
        return error;
 }
 
index a9b322e23cfb9d996a77d0f7b5de6bee1044b3e9..d850b9685f7f78146f96276cce281536d62db832 100644 (file)
@@ -38,7 +38,7 @@ xfs_cui_item_free(
 {
        kvfree(cuip->cui_item.li_lv_shadow);
        if (cuip->cui_format.cui_nextents > XFS_CUI_MAX_FAST_EXTENTS)
-               kmem_free(cuip);
+               kfree(cuip);
        else
                kmem_cache_free(xfs_cui_cache, cuip);
 }
index 489ca8c0e1dc5c11c7f23eb325ae1b27b6549e59..a40b92ac81e8e79b24affa1af4cd628a0b332680 100644 (file)
@@ -38,7 +38,7 @@ xfs_rui_item_free(
 {
        kvfree(ruip->rui_item.li_lv_shadow);
        if (ruip->rui_format.rui_nextents > XFS_RUI_MAX_FAST_EXTENTS)
-               kmem_free(ruip);
+               kfree(ruip);
        else
                kmem_cache_free(xfs_rui_cache, ruip);
 }
index 57ed9baaf156632441af29305c72e34aa35efa5c..2f85567f3d756b3fd824372d8337354176907351 100644 (file)
@@ -1050,7 +1050,7 @@ out_free:
        /*
         * Free the fake mp structure.
         */
-       kmem_free(nmp);
+       kfree(nmp);
 
        /*
         * If we had to allocate a new rsum_cache, we either need to free the
index d167ba00e7cfc89632c443db26b19380a16f405a..6ce1e6deb7ec5f55ac06bb0729f1e5349cda69ac 100644 (file)
@@ -761,7 +761,7 @@ xfs_mount_free(
        debugfs_remove(mp->m_debugfs);
        kfree(mp->m_rtname);
        kfree(mp->m_logname);
-       kmem_free(mp);
+       kfree(mp);
 }
 
 STATIC int
index 5f206cdb40ffd190ec7febf77e62c37cf2a2e032..e4c343096f95a3c818679004b3884601609f384b 100644 (file)
@@ -922,7 +922,7 @@ xfs_trans_ail_init(
        return 0;
 
 out_free_ailp:
-       kmem_free(ailp);
+       kfree(ailp);
        return -ENOMEM;
 }
 
@@ -933,5 +933,5 @@ xfs_trans_ail_destroy(
        struct xfs_ail  *ailp = mp->m_ail;
 
        kthread_stop(ailp->ail_task);
-       kmem_free(ailp);
+       kfree(ailp);
 }