Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964901AbWIDREG (ORCPT ); Mon, 4 Sep 2006 13:04:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964909AbWIDREG (ORCPT ); Mon, 4 Sep 2006 13:04:06 -0400 Received: from mailout.stusta.mhn.de ([141.84.69.5]:7949 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S964901AbWIDRED (ORCPT ); Mon, 4 Sep 2006 13:04:03 -0400 Date: Mon, 4 Sep 2006 19:03:59 +0200 From: Adrian Bunk To: Andrew Morton , Olaf Kirch , Neil Brown Cc: linux-kernel@vger.kernel.org, nfs@lists.sourceforge.net Subject: [-mm patch] make fs/lockd/host.c:nlm_lookup_host() static Message-ID: <20060904170359.GS4416@stusta.de> References: <20060901015818.42767813.akpm@osdl.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060901015818.42767813.akpm@osdl.org> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4096 Lines: 119 On Fri, Sep 01, 2006 at 01:58:18AM -0700, Andrew Morton wrote: >... > Changes since 2.6.18-rc4-mm3: >... > +knfsd-hide-use-of-lockds-h_monitored-flag.patch > +knfsd-consolidate-common-code-for-statd-lockd-notification.patch > +knfsd-when-looking-up-a-lockd-host-pass-hostname-length.patch > +knfsd-lockd-introduce-nsm_handle.patch > +knfsd-misc-minor-fixes-indentation-changes.patch > +knfsd-lockd-make-nlm_host_rebooted-use-the-nsm_handle.patch > +knfsd-lockd-make-the-nsm-upcalls-use-the-nsm_handle.patch > +knfsd-lockd-make-the-hash-chains-use-a-hlist_node.patch > +knfsd-lockd-change-list-of-blocked-list-to-list_node.patch > +knfsd-change-nlm_file-to-use-a-hlist.patch > +knfsd-lockd-make-nlm_traverse_-more-flexible.patch > +knfsd-lockd-add-nlm_destroy_host.patch > +knfsd-simplify-nlmsvc_invalidate_all.patch > +knfsd-lockd-optionally-use-hostnames-for-identifying-peers.patch > +knfsd-make-nlmclnt_next_cookie-smp-safe.patch > +knfsd-match-granted_res-replies-using-cookies.patch > +knfsd-export-nsm_local_state-to-user-space-via-sysctl.patch > +knfsd-lockd-fix-use-of-h_nextrebind.patch > +knfsd-register-all-rpc-programs-with-portmapper-by-default.patch > > nfsd updates. >... nlm_lookup_host() can now become static. Signed-off-by: Adrian Bunk --- fs/lockd/host.c | 48 ++++++++++++++++++------------------ include/linux/lockd/lockd.h | 1 2 files changed, 24 insertions(+), 25 deletions(-) --- linux-2.6.18-rc5-mm1/include/linux/lockd/lockd.h.old 2006-09-01 20:57:28.000000000 +0200 +++ linux-2.6.18-rc5-mm1/include/linux/lockd/lockd.h 2006-09-01 20:57:34.000000000 +0200 @@ -164,7 +164,6 @@ */ struct nlm_host * nlmclnt_lookup_host(const struct sockaddr_in *, int, int, const char *, int); struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *, const char *, int); -struct nlm_host * nlm_lookup_host(int server, const struct sockaddr_in *, int, int, const char *, int); struct rpc_clnt * nlm_bind_host(struct nlm_host *); void nlm_rebind_host(struct nlm_host *); struct nlm_host * nlm_get_host(struct nlm_host *); --- linux-2.6.18-rc5-mm1/fs/lockd/host.c.old 2006-09-01 20:57:42.000000000 +0200 +++ linux-2.6.18-rc5-mm1/fs/lockd/host.c 2006-09-01 20:58:25.000000000 +0200 @@ -38,32 +38,9 @@ const char *, int, int); /* - * Find an NLM server handle in the cache. If there is none, create it. - */ -struct nlm_host * -nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version, - const char *hostname, int hostname_len) -{ - return nlm_lookup_host(0, sin, proto, version, - hostname, hostname_len); -} - -/* - * Find an NLM client handle in the cache. If there is none, create it. - */ -struct nlm_host * -nlmsvc_lookup_host(struct svc_rqst *rqstp, - const char *hostname, int hostname_len) -{ - return nlm_lookup_host(1, &rqstp->rq_addr, - rqstp->rq_prot, rqstp->rq_vers, - hostname, hostname_len); -} - -/* * Common host lookup routine for server & client */ -struct nlm_host * +static struct nlm_host * nlm_lookup_host(int server, const struct sockaddr_in *sin, int proto, int version, const char *hostname, @@ -165,6 +142,29 @@ } /* + * Find an NLM server handle in the cache. If there is none, create it. + */ +struct nlm_host * +nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version, + const char *hostname, int hostname_len) +{ + return nlm_lookup_host(0, sin, proto, version, + hostname, hostname_len); +} + +/* + * Find an NLM client handle in the cache. If there is none, create it. + */ +struct nlm_host * +nlmsvc_lookup_host(struct svc_rqst *rqstp, + const char *hostname, int hostname_len) +{ + return nlm_lookup_host(1, &rqstp->rq_addr, + rqstp->rq_prot, rqstp->rq_vers, + hostname, hostname_len); +} + +/* * Destroy a host */ static void - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/