From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753173Ab1LLQD6 (ORCPT ); Mon, 12 Dec 2011 11:03:58 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:7195 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751627Ab1LLQD5 (ORCPT ); Mon, 12 Dec 2011 11:03:57 -0500 Message-ID: <4EE625E1.7000502@parallels.com> Date: Mon, 12 Dec 2011 20:03:45 +0400 From: Stanislav Kinsbursky User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.23) Gecko/20110922 Lightning/1.0b2 Thunderbird/3.1.15 MIME-Version: 1.0 To: "J. Bruce Fields" CC: "Trond.Myklebust@netapp.com" , "linux-nfs@vger.kernel.org" , Pavel Emelianov , "neilb@suse.de" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , James Bottomley , "davem@davemloft.net" , "devel@openvz.org" Subject: Re: [PATCH 1/4] SUNRPC: use passed network namespace context in rpc_parse_scope_id() References: <20111207111716.17273.63010.stgit@localhost6.localdomain6> <20111207112016.17273.44510.stgit@localhost6.localdomain6> <20111208204749.GC32505@fieldses.org> In-Reply-To: <20111208204749.GC32505@fieldses.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 09.12.2011 00:47, J. Bruce Fields пишет: > On Wed, Dec 07, 2011 at 03:20:16PM +0300, Stanislav Kinsbursky wrote: >> Use incomming network context in rpc_parse_scope_id() instead of hard-coded > > Changelogs are a little confusing; I might have said "allow > rpc_parse_cope_id() caller to pass in network context instead of using > hard-code "init_net"." > Hi, Bruce. Probably, you variant is better. My English is not good enough to write descriptive and, in the same time, clear and short comments to patches. > --b. > >> "init_net". >> >> Signed-off-by: Stanislav Kinsbursky >> >> --- >> net/sunrpc/addr.c | 9 +++++---- >> 1 files changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c >> index 67a655e..35eb188 100644 >> --- a/net/sunrpc/addr.c >> +++ b/net/sunrpc/addr.c >> @@ -156,8 +156,9 @@ static size_t rpc_pton4(const char *buf, const size_t buflen, >> } >> >> #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) >> -static int rpc_parse_scope_id(const char *buf, const size_t buflen, >> - const char *delim, struct sockaddr_in6 *sin6) >> +static int rpc_parse_scope_id(struct net *net, const char *buf, >> + const size_t buflen, const char *delim, >> + struct sockaddr_in6 *sin6) >> { >> char *p; >> size_t len; >> @@ -177,7 +178,7 @@ static int rpc_parse_scope_id(const char *buf, const size_t buflen, >> unsigned long scope_id = 0; >> struct net_device *dev; >> >> - dev = dev_get_by_name(&init_net, p); >> + dev = dev_get_by_name(net, p); >> if (dev != NULL) { >> scope_id = dev->ifindex; >> dev_put(dev); >> @@ -213,7 +214,7 @@ static size_t rpc_pton6(const char *buf, const size_t buflen, >> if (in6_pton(buf, buflen, addr, IPV6_SCOPE_DELIMITER,&delim) == 0) >> return 0; >> >> - if (!rpc_parse_scope_id(buf, buflen, delim, sin6)) >> + if (!rpc_parse_scope_id(&init_net, buf, buflen, delim, sin6)) >> return 0; >> >> sin6->sin6_family = AF_INET6; >> -- Best regards, Stanislav Kinsbursky