Message ID | 20190404100439.19696-1-colin.king@canonical.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 4d2e11d42fe4117c24e79a012904cf0fa7fdcfe3 |
Delegated to: | Jason Gunthorpe |
Headers | show |
Series | [next] opa_vnic: fix check on record->event, incorrect operator used | expand |
On 4/4/2019 6:04 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The check on record->event is always true because the wrong operator > is being used, used && instead of || > > Addresses-Coverity: ("Constant expression result") > Fixes: fae7a699a925 ("opa_vnic: Convert vport_idr to XArray") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > index 76cd09410d9a..be5befd92d16 100644 > --- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > @@ -869,7 +869,7 @@ static void opa_vnic_event(struct ib_event_handler *handler, > record->event, dev_name(&record->device->dev), > record->element.port_num); > > - if (record->event != IB_EVENT_PORT_ERR || > + if (record->event != IB_EVENT_PORT_ERR && > record->event != IB_EVENT_PORT_ACTIVE) > return; > > Missed this in code review. Thanks! Acked-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
On Thu, Apr 04, 2019 at 07:23:45AM -0400, Dennis Dalessandro wrote: > On 4/4/2019 6:04 AM, Colin King wrote: > > From: Colin Ian King <colin.king@canonical.com> > > > > The check on record->event is always true because the wrong operator > > is being used, used && instead of || > > > > Addresses-Coverity: ("Constant expression result") > > Fixes: fae7a699a925 ("opa_vnic: Convert vport_idr to XArray") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > > index 76cd09410d9a..be5befd92d16 100644 > > +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > > @@ -869,7 +869,7 @@ static void opa_vnic_event(struct ib_event_handler *handler, > > record->event, dev_name(&record->device->dev), > > record->element.port_num); > > - if (record->event != IB_EVENT_PORT_ERR || > > + if (record->event != IB_EVENT_PORT_ERR && > > record->event != IB_EVENT_PORT_ACTIVE) > > return; > > > > Missed this in code review. Thanks! > > Acked-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Applied to for-next, thanks Jason
On 4/4/2019 3:34 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The check on record->event is always true because the wrong operator > is being used, used && instead of || > > Addresses-Coverity: ("Constant expression result") > Fixes: fae7a699a925 ("opa_vnic: Convert vport_idr to XArray") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> Cheers, -Mukesh > --- > drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > index 76cd09410d9a..be5befd92d16 100644 > --- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c > @@ -869,7 +869,7 @@ static void opa_vnic_event(struct ib_event_handler *handler, > record->event, dev_name(&record->device->dev), > record->element.port_num); > > - if (record->event != IB_EVENT_PORT_ERR || > + if (record->event != IB_EVENT_PORT_ERR && > record->event != IB_EVENT_PORT_ACTIVE) > return; >
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c index 76cd09410d9a..be5befd92d16 100644 --- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c @@ -869,7 +869,7 @@ static void opa_vnic_event(struct ib_event_handler *handler, record->event, dev_name(&record->device->dev), record->element.port_num); - if (record->event != IB_EVENT_PORT_ERR || + if (record->event != IB_EVENT_PORT_ERR && record->event != IB_EVENT_PORT_ACTIVE) return;