| Message ID | 20230301031038.10851-2-rpearsonhpe@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add error logging to rxe | expand |
On Wed, Mar 1, 2023 at 11:10 AM Bob Pearson <rpearsonhpe@gmail.com> wrote: > > 'exists' looks like a boolean. This patch replaces it by the > normal name used for the rxe device, 'rxe', which should be a > little less confusing. The second rxe_dbg() message is > incorrect since rxe is known to be NULL and this will cause a > seg fault if this message were ever sent. Replace it by pr_debug > for the moment. > > Fixes: c6aba5ea0055 ("RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe.c") > Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com> Acked-by: Zhu Yanjun <zyjzyj2000@gmail.com> Zhu Yanjun > --- > drivers/infiniband/sw/rxe/rxe.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c > index 136c2efe3466..a3f05fdd9fac 100644 > --- a/drivers/infiniband/sw/rxe/rxe.c > +++ b/drivers/infiniband/sw/rxe/rxe.c > @@ -175,7 +175,7 @@ int rxe_add(struct rxe_dev *rxe, unsigned int mtu, const char *ibdev_name) > > static int rxe_newlink(const char *ibdev_name, struct net_device *ndev) > { > - struct rxe_dev *exists; > + struct rxe_dev *rxe; > int err = 0; > > if (is_vlan_dev(ndev)) { > @@ -184,17 +184,17 @@ static int rxe_newlink(const char *ibdev_name, struct net_device *ndev) > goto err; > } > > - exists = rxe_get_dev_from_net(ndev); > - if (exists) { > - ib_device_put(&exists->ib_dev); > - rxe_dbg(exists, "already configured on %s\n", ndev->name); > + rxe = rxe_get_dev_from_net(ndev); > + if (rxe) { > + ib_device_put(&rxe->ib_dev); > + rxe_dbg(rxe, "already configured on %s\n", ndev->name); > err = -EEXIST; > goto err; > } > > err = rxe_net_add(ibdev_name, ndev); > if (err) { > - rxe_dbg(exists, "failed to add %s\n", ndev->name); > + pr_debug("failed to add %s\n", ndev->name); > goto err; > } > err: > -- > 2.37.2 >
diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c index 136c2efe3466..a3f05fdd9fac 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c @@ -175,7 +175,7 @@ int rxe_add(struct rxe_dev *rxe, unsigned int mtu, const char *ibdev_name) static int rxe_newlink(const char *ibdev_name, struct net_device *ndev) { - struct rxe_dev *exists; + struct rxe_dev *rxe; int err = 0; if (is_vlan_dev(ndev)) { @@ -184,17 +184,17 @@ static int rxe_newlink(const char *ibdev_name, struct net_device *ndev) goto err; } - exists = rxe_get_dev_from_net(ndev); - if (exists) { - ib_device_put(&exists->ib_dev); - rxe_dbg(exists, "already configured on %s\n", ndev->name); + rxe = rxe_get_dev_from_net(ndev); + if (rxe) { + ib_device_put(&rxe->ib_dev); + rxe_dbg(rxe, "already configured on %s\n", ndev->name); err = -EEXIST; goto err; } err = rxe_net_add(ibdev_name, ndev); if (err) { - rxe_dbg(exists, "failed to add %s\n", ndev->name); + pr_debug("failed to add %s\n", ndev->name); goto err; } err:
'exists' looks like a boolean. This patch replaces it by the normal name used for the rxe device, 'rxe', which should be a little less confusing. The second rxe_dbg() message is incorrect since rxe is known to be NULL and this will cause a seg fault if this message were ever sent. Replace it by pr_debug for the moment. Fixes: c6aba5ea0055 ("RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe.c") Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com> --- drivers/infiniband/sw/rxe/rxe.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)