| Message ID | 20110207083855.GD4384@bicker |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Feb 07, 2011 at 11:38:55AM +0300, Dan Carpenter wrote: > '!' has higher precedence than '&'. IP_VS_STATE_MASTER is 0x1 so > the original code is equivelent to if (!ipvs->sync_state) ... Thanks Dan, I'll push this to Patrick ASAP. For the record, this seems to have been added as part of the new synchronisation code and as such is only present in development trees at this time. i.e. its not in .37 nor scheduled for .38. > Signed-off-by: Dan Carpenter <error27@gmail.com> > > diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c > index 2a2a836..d1b7298 100644 > --- a/net/netfilter/ipvs/ip_vs_sync.c > +++ b/net/netfilter/ipvs/ip_vs_sync.c > @@ -392,7 +392,7 @@ void ip_vs_sync_switch_mode(struct net *net, int mode) > { > struct netns_ipvs *ipvs = net_ipvs(net); > > - if (!ipvs->sync_state & IP_VS_STATE_MASTER) > + if (!(ipvs->sync_state & IP_VS_STATE_MASTER)) > return; > if (mode == ipvs->sysctl_sync_ver || !ipvs->sync_buff) > return; > -- > To unsubscribe from this list: send the line "unsubscribe lvs-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- 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/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index 2a2a836..d1b7298 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -392,7 +392,7 @@ void ip_vs_sync_switch_mode(struct net *net, int mode) { struct netns_ipvs *ipvs = net_ipvs(net); - if (!ipvs->sync_state & IP_VS_STATE_MASTER) + if (!(ipvs->sync_state & IP_VS_STATE_MASTER)) return; if (mode == ipvs->sysctl_sync_ver || !ipvs->sync_buff) return;
'!' has higher precedence than '&'. IP_VS_STATE_MASTER is 0x1 so the original code is equivelent to if (!ipvs->sync_state) ... Signed-off-by: Dan Carpenter <error27@gmail.com> -- 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