xfs: convert remaining kmem_free() to kfree()

Source kernel commit: d4c75a1b40cd036a84d98e2711db9cf30eaaaf5f

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>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index b22be1477242751b7f99d76799a1ebd989797ec8..2ea8d06ca11920c2e73b1c76eb531b5e7a373f03 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -239,7 +239,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);
 }
 
 /*
@@ -351,7 +351,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);
        }
 }
 
@@ -451,7 +451,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);

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 0d7dc789ce481a5d43ea49ebd89cdf24e0971ed7..fdc53451ce9c2082191cf90e9b47e1a8cdcebf53 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -920,7 +920,7 @@ xfs_attr_shortform_to_leaf(
        }
        error = 0;
 out:
-       kmem_free(tmpbuffer);
+       kfree(tmpbuffer);
        return error;
 }
 
@@ -1121,7 +1121,7 @@ xfs_attr3_leaf_to_shortform(
        error = 0;
 
 out:
-       kmem_free(tmpbuffer);
+       kfree(tmpbuffer);
        return error;
 }
 
@@ -1567,7 +1567,7 @@ xfs_attr3_leaf_compact(
         */
        xfs_trans_log_buf(trans, bp, 0, args->geo->blksize - 1);
 
-       kmem_free(tmpbuffer);
+       kfree(tmpbuffer);
 }
 
 /*
@@ -2287,7 +2287,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);

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 0022bb641bee8ae54dd8c83bb4bec88bde1b0d21..663439ec3e3fae4a97d17d86297e73bd0c756854 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -448,7 +448,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);

diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
index da6e9fa8e8aa2bf0d496aaf9128f364b2a88a4f2..0828cc7e38a731c39d5e2124510abb59e9e1a6e7 100644 (file)
--- a/libxfs/xfs_btree_staging.c
+++ b/libxfs/xfs_btree_staging.c
@@ -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;

diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 33ac8d13c0c5127932c2d18ea02e07d232a4b8da..91009944922fc56dddd84a8b28aa359e7973cb9e 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -2216,7 +2216,7 @@ xfs_da_grow_inode_int(
 
 out_free_map:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
        return error;
 }
 
@@ -2555,7 +2555,7 @@ xfs_dabuf_map(
        *nmaps = nirecs;
 out_free_irecs:
        if (irecs != &irec)
-               kmem_free(irecs);
+               kfree(irecs);
        return error;
 
 invalid_mapping:
@@ -2611,7 +2611,7 @@ xfs_da_get_buf(
 
 out_free:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
 
        return error;
 }
@@ -2652,7 +2652,7 @@ xfs_da_read_buf(
        *bpp = bp;
 out_free:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
 
        return error;
 }
@@ -2683,7 +2683,7 @@ xfs_da_reada_buf(
 
 out_free:
        if (mapp != &map)
-               kmem_free(mapp);
+               kfree(mapp);
 
        return error;
 }

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index 70489b09760f1d4a8f62bd8bd2755cf299600aa9..1de3faf5ed2da6f15aaff1f582d1ba5f20377538 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -1032,7 +1032,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);
 }
 
 /*
@@ -1108,7 +1108,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. */

diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index 52f0461ef07f73231803f21fa3f4cc7198064c16..c2f0efa063931f275f48e6ebac29ab5ee04306a3 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -108,8 +108,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;
        }
 
@@ -177,8 +177,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);
 }
 
 /*
@@ -243,7 +243,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;
 }
 
@@ -312,7 +312,7 @@ xfs_dir_createname(
                rval = xfs_dir2_node_addname(args);
 
 out_free:
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 
@@ -418,7 +418,7 @@ out_check_rval:
        }
 out_free:
        xfs_iunlock(dp, lock_mode);
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 
@@ -476,7 +476,7 @@ xfs_dir_removename(
        else
                rval = xfs_dir2_node_removename(args);
 out_free:
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 
@@ -537,7 +537,7 @@ xfs_dir_replace(
        else
                rval = xfs_dir2_node_replace(args);
 out_free:
-       kmem_free(args);
+       kfree(args);
        return rval;
 }
 

diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c
index b694e62198b5ee8e7fdeb88553f505e73c48aa35..aed3c14a86b964f306cdcc2e9674ddef401de229 100644 (file)
--- a/libxfs/xfs_dir2_block.c
+++ b/libxfs/xfs_dir2_block.c
@@ -1250,7 +1250,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.
         */
@@ -1265,6 +1265,6 @@ xfs_dir2_sf_to_block(
        xfs_dir3_data_check(dp, bp);
        return 0;
 out_free:
-       kmem_free(sfp);
+       kfree(sfp);
        return error;
 }

diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
index 9e0c15f9993e478d1396aea2109c38c6280cbb88..aaf73cd35ca753bfa5430c13ae89191c5bcac93e 100644 (file)
--- a/libxfs/xfs_dir2_sf.c
+++ b/libxfs/xfs_dir2_sf.c
@@ -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);
 }

diff --git a/libxfs/xfs_iext_tree.c b/libxfs/xfs_iext_tree.c
index 641b53f4e03478746287ce37d43e0a35ae9908a8..a3bbd9157be3d389a45ef08eb7fd25ac826f6988 100644 (file)
--- a/libxfs/xfs_iext_tree.c
+++ b/libxfs/xfs_iext_tree.c
@@ -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

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index 7de346e87c108c2c73f06cd02f4c5a586cb8e193..5e0cb488635cf7e5dc3fbcb0ce92bcc06b8afc38 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -469,7 +469,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)
@@ -523,13 +523,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: