Return-Path: Received: from mx143.netapp.com ([216.240.21.24]:19088 "EHLO mx143.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292AbbGMPFO (ORCPT ); Mon, 13 Jul 2015 11:05:14 -0400 Subject: Re: [PATCH 4/9] NFS: Use RPC functions for matching sockaddrs To: Chuck Lever , Anna Schumaker References: <1436561897-8051-1-git-send-email-Anna.Schumaker@Netapp.com> <1436561897-8051-5-git-send-email-Anna.Schumaker@Netapp.com> <20150713070311.GH26245@infradead.org> <55A3C976.20302@Netapp.com> <6CFC438A-9FED-49CC-A7BA-9C5AF757C916@oracle.com> CC: Christoph Hellwig , Trond Myklebust , Linux NFS Mailing List From: Anna Schumaker Message-ID: <55A3CFEF.4000009@gmail.com> Date: Mon, 13 Jul 2015 10:49:19 -0400 MIME-Version: 1.0 In-Reply-To: <6CFC438A-9FED-49CC-A7BA-9C5AF757C916@oracle.com> Content-Type: text/plain; charset="utf-8" Sender: linux-nfs-owner@vger.kernel.org List-ID: On 07/13/2015 10:32 AM, Chuck Lever wrote: > > On Jul 13, 2015, at 10:21 AM, Anna Schumaker wrote: > >> On 07/13/2015 03:03 AM, Christoph Hellwig wrote: >>>> static int nfs_sockaddr_cmp_ip6(const struct sockaddr *sa1, >>>> const struct sockaddr *sa2) >>>> { >>>> const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sa1; >>>> const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sa2; >>>> >>>> - return nfs_sockaddr_match_ipaddr6(sa1, sa2) && >>>> - (sin1->sin6_port == sin2->sin6_port); >>>> + return rpc_cmp_addr6(sa1, sa2) && (sin1->sin6_port == sin2->sin6_port); >>>> } >>>> >>>> static int nfs_sockaddr_cmp_ip4(const struct sockaddr *sa1, >>>> @@ -350,31 +301,8 @@ static int nfs_sockaddr_cmp_ip4(const struct sockaddr *sa1, >>>> const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sa1; >>>> const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sa2; >>>> >>>> - return nfs_sockaddr_match_ipaddr4(sa1, sa2) && >>>> - (sin1->sin_port == sin2->sin_port); >>>> -} >>> >>> I'd say kill nfs_sockaddr_cmp as well and use rpc_cmp_addr in >>> nfs_match_client. >>> >> >> Okay, looking closer at the code now. rpc_cmp_addr() explicitely doesn't check for port number, but nfs_sockaddr_cmp() does. I could add port checking to rpc_cmp_addr(), but I don't know if it was left out intentionally when the code was written. > > Consider adding rpc_cmp_addr_port() which does port checking too? I like this idea. Thanks for the suggestion! Anna > > > -- > Chuck Lever > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >