From mboxrd@z Thu Jan 1 00:00:00 1970 From: jamal Subject: Re: [2/4] [IPSEC] Kill spurious hard expire messages Date: 09 Apr 2005 08:30:44 -0400 Message-ID: <1113049844.1090.23.camel@jzny.localdomain> References: <1112702604.1089.119.camel@jzny.localdomain> <20050409105452.GA7171@gondor.apana.org.au> <20050409111244.GB7171@gondor.apana.org.au> Reply-To: hadi@cyberus.ca Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: "David S. Miller" , Masahide NAKAMURA , Patrick McHardy , netdev Return-path: To: Herbert Xu In-Reply-To: <20050409111244.GB7171@gondor.apana.org.au> Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com List-Id: netdev.vger.kernel.org Herbert, This is nice since it seems to go on top of the patch i posted. I didnt get an ACK from Dave - so i assumed that patch is not on his tree yet. Which tree are you using? Small comment below: On Sat, 2005-04-09 at 07:12, Herbert Xu wrote: > ===== net/xfrm/xfrm_policy.c 1.75 vs edited ===== > --- 1.75/net/xfrm/xfrm_policy.c 2005-04-01 16:24:20 +10:00 > +++ edited/net/xfrm/xfrm_policy.c 2005-04-09 18:02:53 +10:00 > @@ -216,8 +216,8 @@ > > expired: > read_unlock(&xp->lock); > - km_policy_expired(xp, dir, 1); > - xfrm_policy_delete(xp, dir); > + if (!xfrm_policy_delete(xp, dir)) > + km_policy_expired(xp, dir, 1); > xfrm_pol_put(xp);> > } > If the policy was already dead you will still return a 0 from xfrm_policy_delete(). Fixable by policy_kill returning an int. cheers, jamal