From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757775Ab3BGDNr (ORCPT ); Wed, 6 Feb 2013 22:13:47 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:23698 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755216Ab3BGDNr (ORCPT ); Wed, 6 Feb 2013 22:13:47 -0500 X-IronPort-AV: E=Sophos;i="4.84,619,1355068800"; d="scan'208";a="6698244" Message-ID: <51131B88.6040809@cn.fujitsu.com> Date: Thu, 07 Feb 2013 11:12:08 +0800 From: Zhang Yanfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.8) Gecko/20121012 Thunderbird/10.0.8 MIME-Version: 1.0 To: Andrew Morton CC: davem@davemloft.net, Julian Anastasov , Simon Horman , Linux MM , "linux-kernel@vger.kernel.org" Subject: [PATCH] net: fix functions and variables related to netns_ipvs->sysctl_sync_qlen_max X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/07 11:12:24, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/07 11:12:24, Serialize complete at 2013/02/07 11:12:24 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the type of netns_ipvs->sysctl_sync_qlen_max has been changed to unsigned long, type of its related proc var sync_qlen_max should be changed to unsigned long, too. Also the return type of function sysctl_sync_qlen_max(). Cc: David Miller Cc: Julian Anastasov Cc: Simon Horman Signed-off-by: Zhang Yanfei --- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 68c69d5..ba3bd85 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1052,7 +1052,7 @@ static inline int sysctl_sync_ports(struct netns_ipvs *ipvs) return ACCESS_ONCE(ipvs->sysctl_sync_ports); } -static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs) +static inline unsigned long sysctl_sync_qlen_max(struct netns_ipvs *ipvs) { return ipvs->sysctl_sync_qlen_max; } @@ -1099,7 +1099,7 @@ static inline int sysctl_sync_ports(struct netns_ipvs *ipvs) return 1; } -static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs) +static inline unsigned long sysctl_sync_qlen_max(struct netns_ipvs *ipvs) { return IPVS_SYNC_QLEN_MAX; } diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index ec664cb..d79a530 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -1747,9 +1747,9 @@ static struct ctl_table vs_vars[] = { }, { .procname = "sync_qlen_max", - .maxlen = sizeof(int), + .maxlen = sizeof(unsigned long), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_doulongvec_minmax, }, { .procname = "sync_sock_size", -- 1.7.1