Commit 855dad99 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

xfrm_policy: remove always true/false branches 



after previous change oldflo and xdst are always NULL.
These branches were already removed by gcc, this doesn't change code.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ca28286

net/xfrm/xfrm_policy.c

+14 −60
Original line number Diff line number Diff line
@@ -2056,36 +2056,12 @@ xfrm_bundle_lookup(struct net *net, const struct flowi *fl, u16 family, u8 dir, 
{

	struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];

	struct xfrm_dst *xdst, *new_xdst;

	int num_pols = 0, num_xfrms = 0, i, err, pol_dead;

	struct flow_cache_object *oldflo = NULL;

	int num_pols = 0, num_xfrms = 0, err;



	/* Check if the policies from old bundle are usable */

	xdst = NULL;

	if (oldflo) {

		xdst = container_of(oldflo, struct xfrm_dst, flo);

		num_pols = xdst->num_pols;

		num_xfrms = xdst->num_xfrms;

		pol_dead = 0;

		for (i = 0; i < num_pols; i++) {

			pols[i] = xdst->pols[i];

			pol_dead |= pols[i]->walk.dead;

		}

		if (pol_dead) {

			/* Mark DST_OBSOLETE_DEAD to fail the next

			 * xfrm_dst_check()

			 */

			xdst->u.dst.obsolete = DST_OBSOLETE_DEAD;

			dst_release_immediate(&xdst->u.dst);

			xdst = NULL;

			num_pols = 0;

			num_xfrms = 0;

			oldflo = NULL;

		}

	}



	/* Resolve policies to use if we couldn't get them from

	 * previous cache entry */

	if (xdst == NULL) {

	num_pols = 1;

	pols[0] = __xfrm_policy_lookup(net, fl, family,

				       flow_to_policy_dir(dir));
@@ -2097,7 +2073,6 @@ xfrm_bundle_lookup(struct net *net, const struct flowi *fl, u16 family, u8 dir, 
		return NULL;

	if (num_xfrms <= 0)

		goto make_dummy_bundle;

	}



	new_xdst = xfrm_resolve_and_create_bundle(pols, num_pols, fl, family,

						  xflo->dst_orig);
@@ -2105,26 +2080,10 @@ xfrm_bundle_lookup(struct net *net, const struct flowi *fl, u16 family, u8 dir, 
		err = PTR_ERR(new_xdst);

		if (err != -EAGAIN)

			goto error;

		if (oldflo == NULL)

		goto make_dummy_bundle;

		dst_hold(&xdst->u.dst);

		return oldflo;

	} else if (new_xdst == NULL) {

		num_xfrms = 0;

		if (oldflo == NULL)

		goto make_dummy_bundle;

		xdst->num_xfrms = 0;

		dst_hold(&xdst->u.dst);

		return oldflo;

	}



	/* Kill the previous bundle */

	if (xdst) {

		/* The policies were stolen for newly generated bundle */

		xdst->num_pols = 0;

		/* Mark DST_OBSOLETE_DEAD to fail the next xfrm_dst_check() */

		xdst->u.dst.obsolete = DST_OBSOLETE_DEAD;

		dst_release_immediate(&xdst->u.dst);

	}



	return &new_xdst->flo;
@@ -2148,11 +2107,6 @@ xfrm_bundle_lookup(struct net *net, const struct flowi *fl, u16 family, u8 dir, 
inc_error:

	XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);

error:

	if (xdst != NULL) {

		/* Mark DST_OBSOLETE_DEAD to fail the next xfrm_dst_check() */

		xdst->u.dst.obsolete = DST_OBSOLETE_DEAD;

		dst_release_immediate(&xdst->u.dst);

	} else

	xfrm_pols_put(pols, num_pols);

	return ERR_PTR(err);

}