[PATCH wip/jgg-next] fixup! RDMA: Add support to dump resource tracker in RAW format

[PATCH wip/jgg-next] fixup! RDMA: Add support to dump resource tracker in RAW format

[Leon Romanovsky]

From: Leon Romanovsky <leonro@mellanox.com>

Rebase error against
https://lore.kernel.org/r/20200507062942.98305-1-leon@kernel.org

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/core/nldev.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 904e91061f9c..1051b5622b62 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -1301,8 +1301,6 @@ static int res_get_common_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
 	has_cap_net_admin = netlink_capable(skb, CAP_NET_ADMIN);

 	ret = fill_func(msg, has_cap_net_admin, res, port);
-
-	rdma_restrack_put(res);
 	if (ret)
 		goto err_free;

--
2.26.2

Re: [PATCH wip/jgg-next] fixup! RDMA: Add support to dump resource tracker in RAW format

[Jason Gunthorpe]

On Wed, Jun 24, 2020 at 10:00:31AM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
> 
> Rebase error against
> https://lore.kernel.org/r/20200507062942.98305-1-leon@kernel.org
> 
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>  drivers/infiniband/core/nldev.c | 2 --
>  1 file changed, 2 deletions(-)

Hurm, OK, I squashed it in, the commit IDs will change now for your
userspace series

Jason

Re: [PATCH wip/jgg-next] fixup! RDMA: Add support to dump resource tracker in RAW format

[Leon Romanovsky]

On Wed, Jun 24, 2020 at 08:53:31AM -0300, Jason Gunthorpe wrote:
> On Wed, Jun 24, 2020 at 10:00:31AM +0300, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@mellanox.com>
> >
> > Rebase error against
> > https://lore.kernel.org/r/20200507062942.98305-1-leon@kernel.org
> >
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > ---
> >  drivers/infiniband/core/nldev.c | 2 --
> >  1 file changed, 2 deletions(-)
>
> Hurm, OK, I squashed it in, the commit IDs will change now for your
> userspace series

Right, but commit ID is not critical, better to keep bisectability.

>
> Jason