]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - rdma/res-pd.c
rdma: fix spelling error in comment
[mirror_iproute2.git] / rdma / res-pd.c
index 956d4d9fbf7e3f258bf83537be66e243a8397ebe..df538010347587d7200d6b9b8b7dbd169c14159a 100644 (file)
@@ -17,18 +17,16 @@ static int res_pd_line(struct rd *rd, const char *name, int idx,
        uint32_t pdn = 0;
        uint64_t users;
 
-       if (!nla_line[RDMA_NLDEV_ATTR_RES_USECNT] ||
-           (!nla_line[RDMA_NLDEV_ATTR_RES_PID] &&
-            !nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])) {
+       if (!nla_line[RDMA_NLDEV_ATTR_RES_USECNT])
                return MNL_CB_ERROR;
-       }
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY])
                local_dma_lkey = mnl_attr_get_u32(
                        nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY]);
 
        users = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
-       if (rd_check_is_filtered(rd, "users", users))
+       if (rd_is_filtered_attr(rd, "users", users,
+                               nla_line[RDMA_NLDEV_ATTR_RES_USECNT]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY])
@@ -40,18 +38,21 @@ static int res_pd_line(struct rd *rd, const char *name, int idx,
                comm = get_task_name(pid);
        }
 
-       if (rd_check_is_filtered(rd, "pid", pid))
+       if (rd_is_filtered_attr(rd, "pid", pid,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PID]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_CTXN])
                ctxn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
 
-       if (rd_check_is_filtered(rd, "ctxn", ctxn))
+       if (rd_is_filtered_attr(rd, "ctxn", ctxn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_CTXN]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_PDN])
                pdn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
-       if (rd_check_is_filtered(rd, "pdn", pdn))
+       if (rd_is_filtered_attr(rd, "pdn", pdn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PDN]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])
@@ -59,9 +60,7 @@ static int res_pd_line(struct rd *rd, const char *name, int idx,
                comm = (char *)mnl_attr_get_str(
                        nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]);
 
-       if (rd->json_output)
-               jsonw_start_array(rd->jw);
-
+       open_json_object(NULL);
        print_dev(rd, idx, name);
        res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
        print_key(rd, "local_dma_lkey", local_dma_lkey,