From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Perches Subject: Re: [PATCH] net/netfilter/ipvs/ip_vs_ftp.c: Remove use of NIPQUAD Date: Mon, 15 Mar 2010 09:58:34 -0700 Message-ID: <1268672314.4027.46.camel@Joe-Laptop.home> References: <1268094699.1617.5.camel@Joe-Laptop.home> <4B9E5E43.9060206@trash.net> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: Wensong Zhang , Simon Horman , Julian Anastasov , "David S. Miller" , netdev@vger.kernel.org, lvs-devel , LKML To: Patrick McHardy Return-path: In-Reply-To: <4B9E5E43.9060206@trash.net> Sender: lvs-devel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Mon, 2010-03-15 at 17:20 +0100, Patrick McHardy wrote: > Joe Perches wrote: > > NIPQUAD has very few uses left. > > Remove this use and make the code have the identical form of the only > > other use of "%u,%u,%u,%u,%u,%u" in net/ipv4/netfilter/nf_nat_ftp.c > > Are we trying to remove NIPQUAD? That is a goal for me yes. Elimination of unnecessary stuff from kernel.h is useful. > In my opinion the current code is > preferrable to open-coding NIPQUAD. $ grep -r --include=*.[ch] NIPQUAD * include/linux/kernel.h:#define NIPQUAD(addr) \ include/linux/kernel.h:#define NIPQUAD_FMT "%u.%u.%u.%u" net/netfilter/ipvs/ip_vs_ftp.c: sprintf(buf, "%u,%u,%u,%u,%u,%u", NIPQUAD(from.ip), As of right now NIPQUAD_FMT is unused and could be removed from kernel.h There's 1 use of NIPQUAD. Maybe instead of removal the #define could be moved to netfilter.h or netfilter_ipv4.h Another is to consolidate the two uses of "%u,%u,%u,%u,%u,%u" $ grep -r --include=*.[ch] "%u,%u,%u,%u,%u,u%" * fs/cachefiles/bind.c: _enter("{%u,%u,%u,%u,%u,%u},%s", net/ipv4/netfilter/nf_nat_ftp.c: return snprintf(buffer, buflen, "%u,%u,%u,%u,%u,%u", net/netfilter/ipvs/ip_vs_ftp.c: sprintf(buf, "%u,%u,%u,%u,%u,%u", NIPQUAD(from.ip), Maybe these 2 open coded sprintf/snprintf could be consolidated and moved to an appropriate include like netfilter_ipv4 or another. What do you suggest?