| Message ID | 20190222062902.GB30993@kadam (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | RDMA/core: Fix a WARN() message | expand |
> On Feb 22, 2019, at 8:29 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > The first parameter of WARN_ONCE() is a condition, then following > parameters are the message. In this case, we left out the condition so > it will just print the ops->type string. > > Fixes: 3856ec4b93c9 ("RDMA/core: Add RDMA_NLDEV_CMD_NEWLINK/DELLINK support") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Majd Dibbiny <majd@mellanox.com> > --- > drivers/infiniband/core/nldev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c > index 5e94dc87f04f..660a192a44a3 100644 > --- a/drivers/infiniband/core/nldev.c > +++ b/drivers/infiniband/core/nldev.c > @@ -1223,7 +1223,7 @@ void rdma_link_register(struct rdma_link_ops *ops) > { > down_write(&link_ops_rwsem); > if (link_ops_get(ops->type)) { > - WARN_ONCE("Duplicate rdma_link_ops! %s\n", ops->type); > + WARN_ONCE(1, "Duplicate rdma_link_ops! %s\n", ops->type); > goto out; > } > list_add(&ops->list, &link_ops); > -- > 2.17.1 >
On 2/22/2019 12:29 AM, Dan Carpenter wrote: > The first parameter of WARN_ONCE() is a condition, then following > parameters are the message. In this case, we left out the condition so > it will just print the ops->type string. > > Fixes: 3856ec4b93c9 ("RDMA/core: Add RDMA_NLDEV_CMD_NEWLINK/DELLINK support") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/infiniband/core/nldev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c > index 5e94dc87f04f..660a192a44a3 100644 > --- a/drivers/infiniband/core/nldev.c > +++ b/drivers/infiniband/core/nldev.c > @@ -1223,7 +1223,7 @@ void rdma_link_register(struct rdma_link_ops *ops) > { > down_write(&link_ops_rwsem); > if (link_ops_get(ops->type)) { > - WARN_ONCE("Duplicate rdma_link_ops! %s\n", ops->type); > + WARN_ONCE(1, "Duplicate rdma_link_ops! %s\n", ops->type); > goto out; > } > list_add(&ops->list, &link_ops); Reviewed-by: Steve Wise <swise@opengridcomputing.com> Thanks!
On Fri, Feb 22, 2019 at 09:29:02AM +0300, Dan Carpenter wrote: > The first parameter of WARN_ONCE() is a condition, then following > parameters are the message. In this case, we left out the condition so > it will just print the ops->type string. > > Fixes: 3856ec4b93c9 ("RDMA/core: Add RDMA_NLDEV_CMD_NEWLINK/DELLINK support") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > Reviewed-by: Majd Dibbiny <majd@mellanox.com> > Reviewed-by: Steve Wise <swise@opengridcomputing.com> > drivers/infiniband/core/nldev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c > index 5e94dc87f04f..660a192a44a3 100644 > +++ b/drivers/infiniband/core/nldev.c > @@ -1223,7 +1223,7 @@ void rdma_link_register(struct rdma_link_ops *ops) > { > down_write(&link_ops_rwsem); > if (link_ops_get(ops->type)) { > - WARN_ONCE("Duplicate rdma_link_ops! %s\n", ops->type); > + WARN_ONCE(1, "Duplicate rdma_link_ops! %s\n", ops->type); > goto out; I think I prefer if (WARN_ON_ONCE(link_ops_get(ops->type))) goto out; No need to belabor things Applied to for-next with the change Jason
On Fri, Feb 22, 2019 at 11:56:05AM -0700, Jason Gunthorpe wrote: > On Fri, Feb 22, 2019 at 09:29:02AM +0300, Dan Carpenter wrote: > > The first parameter of WARN_ONCE() is a condition, then following > > parameters are the message. In this case, we left out the condition so > > it will just print the ops->type string. > > > > Fixes: 3856ec4b93c9 ("RDMA/core: Add RDMA_NLDEV_CMD_NEWLINK/DELLINK support") > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > Reviewed-by: Majd Dibbiny <majd@mellanox.com> > > Reviewed-by: Steve Wise <swise@opengridcomputing.com> > > drivers/infiniband/core/nldev.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c > > index 5e94dc87f04f..660a192a44a3 100644 > > +++ b/drivers/infiniband/core/nldev.c > > @@ -1223,7 +1223,7 @@ void rdma_link_register(struct rdma_link_ops *ops) > > { > > down_write(&link_ops_rwsem); > > if (link_ops_get(ops->type)) { > > - WARN_ONCE("Duplicate rdma_link_ops! %s\n", ops->type); > > + WARN_ONCE(1, "Duplicate rdma_link_ops! %s\n", ops->type); > > goto out; > > I think I prefer > > if (WARN_ON_ONCE(link_ops_get(ops->type))) > goto out; > > No need to belabor things > > Applied to for-next with the change > Thank you very much, sir! You are a gentleman and a scholar. regards, dan carpenter
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 5e94dc87f04f..660a192a44a3 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -1223,7 +1223,7 @@ void rdma_link_register(struct rdma_link_ops *ops) { down_write(&link_ops_rwsem); if (link_ops_get(ops->type)) { - WARN_ONCE("Duplicate rdma_link_ops! %s\n", ops->type); + WARN_ONCE(1, "Duplicate rdma_link_ops! %s\n", ops->type); goto out; } list_add(&ops->list, &link_ops);
The first parameter of WARN_ONCE() is a condition, then following parameters are the message. In this case, we left out the condition so it will just print the ops->type string. Fixes: 3856ec4b93c9 ("RDMA/core: Add RDMA_NLDEV_CMD_NEWLINK/DELLINK support") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/infiniband/core/nldev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)