From patchwork Mon Feb 7 08:38:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 82080 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 99353B7107 for ; Mon, 7 Feb 2011 19:39:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753125Ab1BGIjU (ORCPT ); Mon, 7 Feb 2011 03:39:20 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:33160 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752775Ab1BGIjS (ORCPT ); Mon, 7 Feb 2011 03:39:18 -0500 Received: by fxm20 with SMTP id 20so4608102fxm.19 for ; Mon, 07 Feb 2011 00:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=w0cok/sZCVN1I1WzHWfso/Tf7IHurMuYsPT8K8Z0V48=; b=L1SsCDpJKnpPgsz+u1qBoNLbXuvvGpVP78NGUCeRXI5lb4uIua+RJcbdR4ItXHnre1 dpBGGT+P5hKnv9BqkqQfAXEr3hdzKTd7wWykZKsvv4kf40C4GSeKDk/arvz0RwIr8rb4 OijjE8nhm1tGDb8hBSLckKqX7plcMxb+2blpc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=J0A2Y0YkTe2r9AVglrKM67O+EYBJXrD2ZM9H7G10ewBwt84WB8iAoML97mNVd7t4NR t4Yml1kwL7iy0iFI4xd1jWL/Bi137LLmkP85/Ypfvx3w7dNqhATcO4LR6EwF8NIfXaZF sGfftU0QjOwr2hkEm/YrOxLlvyXixO1P46dbY= Received: by 10.223.83.7 with SMTP id d7mr4626703fal.82.1297067956526; Mon, 07 Feb 2011 00:39:16 -0800 (PST) Received: from bicker ([212.49.88.34]) by mx.google.com with ESMTPS id e17sm1051222fak.10.2011.02.07.00.39.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 07 Feb 2011 00:39:15 -0800 (PST) Date: Mon, 7 Feb 2011 11:38:55 +0300 From: Dan Carpenter To: Wensong Zhang Cc: Simon Horman , Julian Anastasov , hans.schillstrom@ericsson.com, Patrick McHardy , "David S. Miller" , netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] IPVS: precedence bug in ip_vs_sync_switch_mode() Message-ID: <20110207083855.GD4384@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org '!' 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 --- 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;