Message ID | 5003CC41.9080204@cn.fujitsu.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
Without a proper signoff, I won't apply your patch. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 16 Jul 2012 16:09:37 +0800 Li Wei <lw@cn.fujitsu.com> wrote: > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index becb048..a7fec9d 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -2516,7 +2516,7 @@ static int rt6_fill_node(struct net *net, > goto nla_put_failure; > if (!(rt->rt6i_flags & RTF_EXPIRES)) > expires = 0; > - else if (rt->dst.expires - jiffies < INT_MAX) > + else if ((int)(rt->dst.expires - jiffies) < INT_MAX) > expires = rt->dst.expires - jiffies; > else > expires = INT_MAX; Why not use time_is_after_jiffies() macro? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
于 2012-7-17 0:41, Stephen Hemminger 写道: > On Mon, 16 Jul 2012 16:09:37 +0800 > Li Wei <lw@cn.fujitsu.com> wrote: > >> diff --git a/net/ipv6/route.c b/net/ipv6/route.c >> index becb048..a7fec9d 100644 >> --- a/net/ipv6/route.c >> +++ b/net/ipv6/route.c >> @@ -2516,7 +2516,7 @@ static int rt6_fill_node(struct net *net, >> goto nla_put_failure; >> if (!(rt->rt6i_flags & RTF_EXPIRES)) >> expires = 0; >> - else if (rt->dst.expires - jiffies < INT_MAX) >> + else if ((int)(rt->dst.expires - jiffies) < INT_MAX) >> expires = rt->dst.expires - jiffies; >> else >> expires = INT_MAX; > > Why not use time_is_after_jiffies() macro? time_is_after_jiffies() return a bool but we need "how much time before/after jiffies" here. > > However, I also think these code seems a little ugly, because we need to store the result of two "unsigned long"'s subtraction into an integer. Maybe we should distinguish expires before and after jiffies to proper process the overflows. Thanks, Wei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
于 2012-7-16 17:56, David Miller 写道: > > Without a proper signoff, I won't apply your patch. > > Sorry for that, I will append a signoff, do some code refactor and send a V2. Thanks, Wei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stephen Hemminger <shemminger@vyatta.com> Date: Mon, 16 Jul 2012 09:41:24 -0700 > On Mon, 16 Jul 2012 16:09:37 +0800 > Li Wei <lw@cn.fujitsu.com> wrote: > >> diff --git a/net/ipv6/route.c b/net/ipv6/route.c >> index becb048..a7fec9d 100644 >> --- a/net/ipv6/route.c >> +++ b/net/ipv6/route.c >> @@ -2516,7 +2516,7 @@ static int rt6_fill_node(struct net *net, >> goto nla_put_failure; >> if (!(rt->rt6i_flags & RTF_EXPIRES)) >> expires = 0; >> - else if (rt->dst.expires - jiffies < INT_MAX) >> + else if ((int)(rt->dst.expires - jiffies) < INT_MAX) >> expires = rt->dst.expires - jiffies; >> else >> expires = INT_MAX; > > Why not use time_is_after_jiffies() macro? This test has a wider window of acceptance. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 21318d1..f92f3d8 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -641,7 +641,8 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, }; if (expires) - ci.rta_expires = jiffies_to_clock_t(expires); + ci.rta_expires = expires > 0 ? jiffies_to_clock_t(expires) + : -jiffies_to_clock_t(-expires); return nla_put(skb, RTA_CACHEINFO, sizeof(ci), &ci); } diff --git a/net/ipv6/route.c b/net/ipv6/route.c index becb048..a7fec9d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2516,7 +2516,7 @@ static int rt6_fill_node(struct net *net, goto nla_put_failure; if (!(rt->rt6i_flags & RTF_EXPIRES)) expires = 0; - else if (rt->dst.expires - jiffies < INT_MAX) + else if ((int)(rt->dst.expires - jiffies) < INT_MAX) expires = rt->dst.expires - jiffies; else expires = INT_MAX;