matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rdma: Remove duplicated print code 

There is no need to keep same print functions for
uint32_t and uint64_t, unify them into one function.

Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Leon Romanovsky 2019-02-23 11:15:11 +02:00 committed by David Ahern
parent a985cc06bd
commit beac6a3990
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rdma/res.c
View File

@ -808,28 +808,20 @@ static int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data)
return MNL_CB_OK; return MNL_CB_OK;
} }
static void print_key(struct rd *rd, const char *name, uint32_t val) static void print_key(struct rd *rd, const char *name, uint64_t val)
{ {
if (rd->json_output) if (rd->json_output)
jsonw_xint_field(rd->jw, name, val); jsonw_xint_field(rd->jw, name, val);
else else
pr_out("%s 0x%x ", name, val); pr_out("%s 0x%" PRIx64 " ", name, val);
} }
static void print_iova(struct rd *rd, uint64_t val) static void res_print_uint(struct rd *rd, const char *name, uint64_t val)
{ {
if (rd->json_output) if (rd->json_output)
jsonw_xint_field(rd->jw, "iova", val); jsonw_uint_field(rd->jw, name, val);
else else
pr_out("iova 0x%" PRIx64 " ", val); pr_out("%s %" PRIu64 " ", name, val);
}
static void print_mrlen(struct rd *rd, uint64_t val)
{
if (rd->json_output)
jsonw_uint_field(rd->jw, "mrlen", val);
else
pr_out("mrlen %" PRIu64 " ", val);
} }
static int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data) static int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data)
@ -907,8 +899,8 @@ static int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data)
if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY]) if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY])
print_key(rd, "lkey", lkey); print_key(rd, "lkey", lkey);
if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA]) if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA])
print_iova(rd, iova); print_key(rd, "iova", iova);
print_mrlen(rd, mrlen); res_print_uint(rd, "mrlen", mrlen);
print_pid(rd, pid); print_pid(rd, pid);
print_comm(rd, comm, nla_line); print_comm(rd, comm, nla_line);