Commit c585646d authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] fs/lockd/host.c: make 2 functions static 



Make the following needlessly global functions static:

 - nlm_lookup_host()
 - nsm_find()

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7ddae860

fs/lockd/host.c

+28 −25
Original line number Diff line number Diff line
@@ -36,34 +36,14 @@ static DEFINE_MUTEX(nlm_host_mutex); 
static void			nlm_gc_hosts(void);

static struct nsm_handle *	__nsm_find(const struct sockaddr_in *,

					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);

}

static struct nsm_handle *	nsm_find(const struct sockaddr_in *sin,

					 const char *hostname,

					 int 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,
@@ -194,6 +174,29 @@ nlm_destroy_host(struct nlm_host *host) 
	kfree(host);

}



/*

 * 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);

}



/*

 * Create the NLM RPC client for an NLM peer

 */
@@ -495,7 +498,7 @@ __nsm_find(const struct sockaddr_in *sin, 
	return nsm;

}



struct nsm_handle *

static struct nsm_handle *

nsm_find(const struct sockaddr_in *sin, const char *hostname, int hostname_len)

{

	return __nsm_find(sin, hostname, hostname_len, 1);

include/linux/lockd/lockd.h

+0 −2
Original line number Diff line number Diff line
@@ -164,14 +164,12 @@ void nlmclnt_next_cookie(struct nlm_cookie *); 
 */

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 *);

void		  nlm_release_host(struct nlm_host *);

void		  nlm_shutdown_hosts(void);

extern void	  nlm_host_rebooted(const struct sockaddr_in *, const char *, int, u32);

struct nsm_handle *nsm_find(const struct sockaddr_in *, const char *, int);

void		  nsm_release(struct nsm_handle *);