Message ID | 20180523105859.GA74092@ivb42 |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
Series | netfilter: nft_numgen: fix ptr_ret.cocci warnings | expand |
On Wed, May 23, 2018 at 12:58 PM, kbuild test robot <fengguang.wu@intel.com> wrote: > From: kbuild test robot <fengguang.wu@intel.com> > > net/netfilter/nft_numgen.c:117:1-3: WARNING: PTR_ERR_OR_ZERO can be used > > > Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR > > Generated by: scripts/coccinelle/api/ptr_ret.cocci > > Fixes: d734a2888922 ("netfilter: nft_numgen: add map lookups for numgen statements") > CC: Laura Garcia Liebana <nevola@gmail.com> > Signed-off-by: kbuild test robot <fengguang.wu@intel.com> Acked-by: Laura Garcia Liebana <nevola@gmail.com>
On Thu, May 24, 2018 at 12:40:04PM +0200, Laura Garcia wrote: > On Wed, May 23, 2018 at 12:58 PM, kbuild test robot > <fengguang.wu@intel.com> wrote: > > From: kbuild test robot <fengguang.wu@intel.com> > > > > net/netfilter/nft_numgen.c:117:1-3: WARNING: PTR_ERR_OR_ZERO can be used > > > > > > Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR > > > > Generated by: scripts/coccinelle/api/ptr_ret.cocci > > > > Fixes: d734a2888922 ("netfilter: nft_numgen: add map lookups for numgen statements") > > CC: Laura Garcia Liebana <nevola@gmail.com> > > Signed-off-by: kbuild test robot <fengguang.wu@intel.com> > > Acked-by: Laura Garcia Liebana <nevola@gmail.com> Applied, thanks.
--- a/net/netfilter/nft_numgen.c +++ b/net/netfilter/nft_numgen.c @@ -114,10 +114,7 @@ static int nft_ng_inc_map_init(const str tb[NFTA_NG_SET_NAME], tb[NFTA_NG_SET_ID], genmask); - if (IS_ERR(priv->map)) - return PTR_ERR(priv->map); - - return 0; + return PTR_ERR_OR_ZERO(priv->map); } static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg,