| Message ID | 20201031060153.39912-1-yuehaibing@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [ovs-dev,net-next] openvswitch: Use IS_ERR instead of IS_ERR_OR_NULL | expand |
On Sat, Oct 31, 2020 at 2:02 PM YueHaibing <yuehaibing@huawei.com> wrote: > > Fix smatch warning: > > net/openvswitch/meter.c:427 ovs_meter_cmd_set() warn: passing zero to 'PTR_ERR' > > dp_meter_create() never returns NULL, use IS_ERR > instead of IS_ERR_OR_NULL to fix this. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Acked-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> > --- > net/openvswitch/meter.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c > index 8fbefd52af7f..15424d26e85d 100644 > --- a/net/openvswitch/meter.c > +++ b/net/openvswitch/meter.c > @@ -423,7 +423,7 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info) > return -EINVAL; > > meter = dp_meter_create(a); > - if (IS_ERR_OR_NULL(meter)) > + if (IS_ERR(meter)) > return PTR_ERR(meter); > > reply = ovs_meter_cmd_reply_start(info, OVS_METER_CMD_SET, > -- > 2.17.1 >
On Sat, 31 Oct 2020 14:01:53 +0800 YueHaibing wrote: > Fix smatch warning: > > net/openvswitch/meter.c:427 ovs_meter_cmd_set() warn: passing zero to 'PTR_ERR' > > dp_meter_create() never returns NULL, use IS_ERR > instead of IS_ERR_OR_NULL to fix this. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied, thanks!
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c index 8fbefd52af7f..15424d26e85d 100644 --- a/net/openvswitch/meter.c +++ b/net/openvswitch/meter.c @@ -423,7 +423,7 @@ static int ovs_meter_cmd_set(struct sk_buff *skb, struct genl_info *info) return -EINVAL; meter = dp_meter_create(a); - if (IS_ERR_OR_NULL(meter)) + if (IS_ERR(meter)) return PTR_ERR(meter); reply = ovs_meter_cmd_reply_start(info, OVS_METER_CMD_SET,
Fix smatch warning: net/openvswitch/meter.c:427 ovs_meter_cmd_set() warn: passing zero to 'PTR_ERR' dp_meter_create() never returns NULL, use IS_ERR instead of IS_ERR_OR_NULL to fix this. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- net/openvswitch/meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)