Commit 7b218574 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[IPV4]: Small style cleanup of the error path in rtm_to_ifaddr.



Remove error code assignment inside brackets on failure. The code
looks better if the error is assigned before condition check. Also,
the compiler treats this better.
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dce5cbee
...@@ -492,39 +492,34 @@ static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh) ...@@ -492,39 +492,34 @@ static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh)
struct ifaddrmsg *ifm; struct ifaddrmsg *ifm;
struct net_device *dev; struct net_device *dev;
struct in_device *in_dev; struct in_device *in_dev;
int err = -EINVAL; int err;
err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy); err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy);
if (err < 0) if (err < 0)
goto errout; goto errout;
ifm = nlmsg_data(nlh); ifm = nlmsg_data(nlh);
if (ifm->ifa_prefixlen > 32 || tb[IFA_LOCAL] == NULL) { err = -EINVAL;
err = -EINVAL; if (ifm->ifa_prefixlen > 32 || tb[IFA_LOCAL] == NULL)
goto errout; goto errout;
}
dev = __dev_get_by_index(&init_net, ifm->ifa_index); dev = __dev_get_by_index(&init_net, ifm->ifa_index);
if (dev == NULL) { err = -ENODEV;
err = -ENODEV; if (dev == NULL)
goto errout; goto errout;
}
in_dev = __in_dev_get_rtnl(dev); in_dev = __in_dev_get_rtnl(dev);
if (in_dev == NULL) { err = -ENOBUFS;
err = -ENOBUFS; if (in_dev == NULL)
goto errout; goto errout;
}
ifa = inet_alloc_ifa(); ifa = inet_alloc_ifa();
if (ifa == NULL) { if (ifa == NULL)
/* /*
* A potential indev allocation can be left alive, it stays * A potential indev allocation can be left alive, it stays
* assigned to its device and is destroy with it. * assigned to its device and is destroy with it.
*/ */
err = -ENOBUFS;
goto errout; goto errout;
}
ipv4_devconf_setall(in_dev); ipv4_devconf_setall(in_dev);
in_dev_hold(in_dev); in_dev_hold(in_dev);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment