xfs: convert kmem_zalloc() to kzalloc()

Source kernel commit: 10634530f7ba947d8eab52a580e0840778d4ef75

There's no reason to keep the kmem_zalloc() around anymore, it's
just a thin wrapper around kmalloc(), so lets get rid of it.

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/include/kmem.h b/include/kmem.h
index 8ae919c706619dbaf710efe2d3a28ef7d9a39d77..6818a404728f81279544f54fed84aadc88fa7eca 100644 (file)
--- a/include/kmem.h
+++ b/include/kmem.h
@@ -25,8 +25,9 @@ typedef unsigned int __bitwise gfp_t;
 #define GFP_NOFS       ((__force gfp_t)0)
 #define __GFP_NOFAIL   ((__force gfp_t)0)
 #define __GFP_NOLOCKDEP        ((__force gfp_t)0)
+#define __GFP_RETRY_MAYFAIL    ((__force gfp_t)0)
 
-#define __GFP_ZERO     (__force gfp_t)1
+#define __GFP_ZERO     ((__force gfp_t)1)
 
 struct kmem_cache * kmem_cache_create(const char *name, unsigned int size,
                unsigned int align, unsigned int slab_flags,
@@ -65,6 +66,8 @@ static inline void *kmalloc(size_t size, gfp_t flags)
        return kvmalloc(size, flags);
 }
 
+#define kzalloc(size, gfp)     kvmalloc((size), (gfp) | __GFP_ZERO)
+
 static inline void kfree(const void *ptr)
 {
        return kmem_free(ptr);

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 0556d55470596a98b1fdcfb93443f73ea0d70626..b22be1477242751b7f99d76799a1ebd989797ec8 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -379,7 +379,7 @@ xfs_initialize_perag(
                        continue;
                }
 
-               pag = kmem_zalloc(sizeof(*pag), KM_MAYFAIL);
+               pag = kzalloc(sizeof(*pag), GFP_KERNEL | __GFP_RETRY_MAYFAIL);
                if (!pag) {
                        error = -ENOMEM;
                        goto out_unwind_new_pags;

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index e3f8f67b5195b27a1471d4eba891c8ebde320195..8a0a7c21932c741c65e1f399fd33f83499aa44cb 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -2247,7 +2247,8 @@ xfs_attr3_leaf_unbalance(
                struct xfs_attr_leafblock *tmp_leaf;
                struct xfs_attr3_icleaf_hdr tmphdr;
 
-               tmp_leaf = kmem_zalloc(state->args->geo->blksize, 0);
+               tmp_leaf = kzalloc(state->args->geo->blksize,
+                               GFP_KERNEL | __GFP_NOFAIL);
 
                /*
                 * Copy the header into the temp leaf so that all the stuff

diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
index 0ea44dcf14f3cc40151f61a59e3d5294fb4cff89..45b793559b069087009acc572e1e48473a5323be 100644 (file)
--- a/libxfs/xfs_btree_staging.c
+++ b/libxfs/xfs_btree_staging.c
@@ -406,7 +406,7 @@ xfs_btree_bload_prep_block(
 
                /* Allocate a new incore btree root block. */
                new_size = bbl->iroot_size(cur, level, nr_this_block, priv);
-               ifp->if_broot = kmem_zalloc(new_size, 0);
+               ifp->if_broot = kzalloc(new_size, GFP_KERNEL);
                ifp->if_broot_bytes = (int)new_size;
 
                /* Initialize it and send it out. */

diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 0779bb6242ca58f3de27444cc190e43281c501a9..0864cb5ed74eb3370c7813a38796f66ded311726 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -2514,7 +2514,7 @@ xfs_dabuf_map(
        int                     error = 0, nirecs, i;
 
        if (nfsb > 1)
-               irecs = kmem_zalloc(sizeof(irec) * nfsb, KM_NOFS);
+               irecs = kzalloc(sizeof(irec) * nfsb, GFP_NOFS | __GFP_NOFAIL);
 
        nirecs = nfsb;
        error = xfs_bmapi_read(dp, bno, nfsb, irecs, &nirecs,
@@ -2527,7 +2527,8 @@ xfs_dabuf_map(
         * larger one that needs to be free by the caller.
         */
        if (nirecs > 1) {
-               map = kmem_zalloc(nirecs * sizeof(struct xfs_buf_map), KM_NOFS);
+               map = kzalloc(nirecs * sizeof(struct xfs_buf_map),
+                               GFP_NOFS | __GFP_NOFAIL);
                if (!map) {
                        error = -ENOMEM;
                        goto out_free_irecs;

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index bf1d1e06a35b9cf816c86d928f8d3951652973c4..70489b09760f1d4a8f62bd8bd2755cf299600aa9 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -973,7 +973,7 @@ xfs_defer_ops_capture(
                return ERR_PTR(error);
 
        /* Create an object to capture the defer ops. */
-       dfc = kmem_zalloc(sizeof(*dfc), KM_NOFS);
+       dfc = kzalloc(sizeof(*dfc), GFP_NOFS | __GFP_NOFAIL);
        INIT_LIST_HEAD(&dfc->dfc_list);
        INIT_LIST_HEAD(&dfc->dfc_dfops);
 

diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index a781520c856d4fe93678e3d70d325201aab12858..cb299a6ed500b417b2c6f130dd45762d9fbd40f7 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -103,10 +103,10 @@ xfs_da_mount(
        ASSERT(mp->m_sb.sb_versionnum & XFS_SB_VERSION_DIRV2BIT);
        ASSERT(xfs_dir2_dirblock_bytes(&mp->m_sb) <= XFS_MAX_BLOCKSIZE);
 
-       mp->m_dir_geo = kmem_zalloc(sizeof(struct xfs_da_geometry),
-                                   KM_MAYFAIL);
-       mp->m_attr_geo = kmem_zalloc(sizeof(struct xfs_da_geometry),
-                                    KM_MAYFAIL);
+       mp->m_dir_geo = kzalloc(sizeof(struct xfs_da_geometry),
+                               GFP_KERNEL | __GFP_RETRY_MAYFAIL);
+       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);
@@ -235,7 +235,7 @@ xfs_dir_init(
        if (error)
                return error;
 
-       args = kmem_zalloc(sizeof(*args), KM_NOFS);
+       args = kzalloc(sizeof(*args), GFP_NOFS | __GFP_NOFAIL);
        if (!args)
                return -ENOMEM;
 
@@ -272,7 +272,7 @@ xfs_dir_createname(
                XFS_STATS_INC(dp->i_mount, xs_dir_create);
        }
 
-       args = kmem_zalloc(sizeof(*args), KM_NOFS);
+       args = kzalloc(sizeof(*args), GFP_NOFS | __GFP_NOFAIL);
        if (!args)
                return -ENOMEM;
 
@@ -371,7 +371,7 @@ xfs_dir_lookup(
         * lockdep Doing this avoids having to add a bunch of lockdep class
         * annotations into the reclaim path for the ilock.
         */
-       args = kmem_zalloc(sizeof(*args), KM_NOFS);
+       args = kzalloc(sizeof(*args), GFP_NOFS | __GFP_NOFAIL);
        args->geo = dp->i_mount->m_dir_geo;
        args->name = name->name;
        args->namelen = name->len;
@@ -440,7 +440,7 @@ xfs_dir_removename(
        ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
        XFS_STATS_INC(dp->i_mount, xs_dir_remove);
 
-       args = kmem_zalloc(sizeof(*args), KM_NOFS);
+       args = kzalloc(sizeof(*args), GFP_NOFS | __GFP_NOFAIL);
        if (!args)
                return -ENOMEM;
 
@@ -501,7 +501,7 @@ xfs_dir_replace(
        if (rval)
                return rval;
 
-       args = kmem_zalloc(sizeof(*args), KM_NOFS);
+       args = kzalloc(sizeof(*args), GFP_NOFS | __GFP_NOFAIL);
        if (!args)
                return -ENOMEM;
 

diff --git a/libxfs/xfs_iext_tree.c b/libxfs/xfs_iext_tree.c
index 24124039fdd86c8cc0161364afce81e1c8e2edfa..641b53f4e03478746287ce37d43e0a35ae9908a8 100644 (file)
--- a/libxfs/xfs_iext_tree.c
+++ b/libxfs/xfs_iext_tree.c
@@ -398,7 +398,8 @@ static void
 xfs_iext_grow(
        struct xfs_ifork        *ifp)
 {
-       struct xfs_iext_node    *node = kmem_zalloc(NODE_SIZE, KM_NOFS);
+       struct xfs_iext_node    *node = kzalloc(NODE_SIZE,
+                                               GFP_NOFS | __GFP_NOFAIL);
        int                     i;
 
        if (ifp->if_height == 1) {
@@ -454,7 +455,8 @@ xfs_iext_split_node(
        int                     *nr_entries)
 {
        struct xfs_iext_node    *node = *nodep;
-       struct xfs_iext_node    *new = kmem_zalloc(NODE_SIZE, KM_NOFS);
+       struct xfs_iext_node    *new = kzalloc(NODE_SIZE,
+                                               GFP_NOFS | __GFP_NOFAIL);
        const int               nr_move = KEYS_PER_NODE / 2;
        int                     nr_keep = nr_move + (KEYS_PER_NODE & 1);
        int                     i = 0;
@@ -542,7 +544,8 @@ xfs_iext_split_leaf(
        int                     *nr_entries)
 {
        struct xfs_iext_leaf    *leaf = cur->leaf;
-       struct xfs_iext_leaf    *new = kmem_zalloc(NODE_SIZE, KM_NOFS);
+       struct xfs_iext_leaf    *new = kzalloc(NODE_SIZE,
+                                               GFP_NOFS | __GFP_NOFAIL);
        const int               nr_move = RECS_PER_LEAF / 2;
        int                     nr_keep = nr_move + (RECS_PER_LEAF & 1);
        int                     i;
@@ -583,7 +586,8 @@ xfs_iext_alloc_root(
 {
        ASSERT(ifp->if_bytes == 0);
 
-       ifp->if_data = kmem_zalloc(sizeof(struct xfs_iext_rec), KM_NOFS);
+       ifp->if_data = kzalloc(sizeof(struct xfs_iext_rec),
+                                       GFP_NOFS | __GFP_NOFAIL);
        ifp->if_height = 1;
 
        /* now that we have a node step into it */