LU-9679 ptlrpc: use OBD_ALLOC_PTR_ARRAY() and FREE

[fs/lustre-release.git] / lustre / ptlrpc / nodemap_storage.c

diff --git a/lustre/ptlrpc/nodemap_storage.c b/lustre/ptlrpc/nodemap_storage.c
index 6951db0..e22ea72 100644 (file)
--- a/lustre/ptlrpc/nodemap_storage.c
+++ b/lustre/ptlrpc/nodemap_storage.c
@@ -722,7 +722,6 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
                        if (nodemap_id == LUSTRE_NODEMAP_DEFAULT_ID) {
                                nodemap = nodemap_create(rec->ncr.ncr_name,
                                                         config, 1);
-                               config->nmc_default_nodemap = nodemap;
                        } else {
                                nodemap = nodemap_create(rec->ncr.ncr_name,
                                                         config, 0);
@@ -937,10 +936,10 @@ out:
 
        if (new_config->nmc_default_nodemap == NULL) {
                /* new MGS won't have a default nm on disk, so create it here */
-               new_config->nmc_default_nodemap =
+               struct lu_nodemap *nodemap =
                        nodemap_create(DEFAULT_NODEMAP, new_config, 1);
-               if (IS_ERR(new_config->nmc_default_nodemap)) {
-                       rc = PTR_ERR(new_config->nmc_default_nodemap);
+               if (IS_ERR(nodemap)) {
+                       rc = PTR_ERR(nodemap);
                } else {
                        rc = nodemap_idx_nodemap_add_update(
                                        new_config->nmc_default_nodemap,
@@ -1489,7 +1488,7 @@ int nodemap_get_config_req(struct obd_device *mgs_obd,
               body->mcb_name, rdpg.rp_count);
 
        /* allocate pages to store the containers */
-       OBD_ALLOC(rdpg.rp_pages, sizeof(*rdpg.rp_pages) * rdpg.rp_npages);
+       OBD_ALLOC_PTR_ARRAY(rdpg.rp_pages, rdpg.rp_npages);
        if (rdpg.rp_pages == NULL)
                RETURN(-ENOMEM);
        for (i = 0; i < rdpg.rp_npages; i++) {
@@ -1521,8 +1520,7 @@ int nodemap_get_config_req(struct obd_device *mgs_obd,
        page_count = (bytes + PAGE_SIZE - 1) >> PAGE_SHIFT;
        LASSERT(page_count <= rdpg.rp_count);
        desc = ptlrpc_prep_bulk_exp(req, page_count, 1,
-                                   PTLRPC_BULK_PUT_SOURCE |
-                                       PTLRPC_BULK_BUF_KIOV,
+                                   PTLRPC_BULK_PUT_SOURCE,
                                    MGS_BULK_PORTAL, frag_ops);
        if (desc == NULL)
                GOTO(out, rc = -ENOMEM);
@@ -1541,8 +1539,7 @@ out:
                for (i = 0; i < rdpg.rp_npages; i++)
                        if (rdpg.rp_pages[i] != NULL)
                                __free_page(rdpg.rp_pages[i]);
-               OBD_FREE(rdpg.rp_pages,
-                        rdpg.rp_npages * sizeof(rdpg.rp_pages[0]));
+               OBD_FREE_PTR_ARRAY(rdpg.rp_pages, rdpg.rp_npages);
        }
        return rc;
 }