2014-07-27 07:07:55

by Himangi Saraogi

Subject: [PATCH] openvswitch: Use IS_ERR_OR_NULL

This patch introduces the use of the macro IS_ERR_OR_NULL in place of
tests for NULL and IS_ERR.

The following Coccinelle semantic patch was used for making the change:

@@
expression e;
@@

- e == NULL || IS_ERR(e)
+ IS_ERR_OR_NULL(e)
|| ...

Signed-off-by: Himangi Saraogi <[email protected]>
Acked-by: Julia Lawall <[email protected]>
---
net/openvswitch/datapath.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 20f59b6..e3b3c21 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -780,7 +780,7 @@ static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow,

skb = ovs_flow_cmd_alloc_info(ovsl_dereference(flow->sf_acts), info,
always);
- if (!skb || IS_ERR(skb))
+ if (IS_ERR_OR_NULL(skb))
return skb;

retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb,
--
1.9.1

2014-07-28 20:37:12

by Pravin Shelar

Subject: Re: [PATCH] openvswitch: Use IS_ERR_OR_NULL

On Sun, Jul 27, 2014 at 12:07 AM, Himangi Saraogi <[email protected]> wrote:
> This patch introduces the use of the macro IS_ERR_OR_NULL in place of
> tests for NULL and IS_ERR.
>
> The following Coccinelle semantic patch was used for making the change:
>
> @@
> expression e;
> @@
>
> - e == NULL || IS_ERR(e)
> + IS_ERR_OR_NULL(e)
> || ...
>
> Signed-off-by: Himangi Saraogi <[email protected]>
> Acked-by: Julia Lawall <[email protected]>

Looks good.
Acked-by: Pravin B Shelar <[email protected]>

> ---
> net/openvswitch/datapath.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
> index 20f59b6..e3b3c21 100644
> --- a/net/openvswitch/datapath.c
> +++ b/net/openvswitch/datapath.c
> @@ -780,7 +780,7 @@ static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow,
>
> skb = ovs_flow_cmd_alloc_info(ovsl_dereference(flow->sf_acts), info,
> always);
> - if (!skb || IS_ERR(skb))
> + if (IS_ERR_OR_NULL(skb))
> return skb;
>
> retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb,
> --
> 1.9.1
>

2014-07-29 22:32:31

by David Miller

Subject: Re: [PATCH] openvswitch: Use IS_ERR_OR_NULL

From: Himangi Saraogi <[email protected]>
Date: Sun, 27 Jul 2014 12:37:46 +0530

> This patch introduces the use of the macro IS_ERR_OR_NULL in place of
> tests for NULL and IS_ERR.
>
> The following Coccinelle semantic patch was used for making the change:
>
> @@
> expression e;
> @@
>
> - e == NULL || IS_ERR(e)
> + IS_ERR_OR_NULL(e)
> || ...
>
> Signed-off-by: Himangi Saraogi <[email protected]>
> Acked-by: Julia Lawall <[email protected]>

Applied.