Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8529bc51 authored Dec 11, 2008 by Chuck Lever Committed by J. Bruce Fields Jan 06, 2009

NSM: Move nsm_addr() to fs/lockd/mon.c



Clean up: nsm_addr_in() is no longer used, and nsm_addr() is used only in
fs/lockd/mon.c, so move it there.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

parent e6765b83

fs/lockd/mon.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,11 @@ static DEFINE_SPINLOCK(nsm_lock);
		*/
		int nsm_local_state;

		static inline struct sockaddr nsm_addr(const struct nsm_handle nsm)
		{
		return (struct sockaddr *)&nsm->sm_addr;
		}

		static void nsm_display_ipv4_address(const struct sockaddr sap, char buf,
		const size_t len)
		{

include/linux/lockd/lockd.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -112,16 +112,6 @@ static inline struct sockaddr nlm_srcaddr(const struct nlm_host host)
		return (struct sockaddr *)&host->h_srcaddr;
		}

		static inline struct sockaddr_in nsm_addr_in(const struct nsm_handle handle)
		{
		return (struct sockaddr_in *)&handle->sm_addr;
		}

		static inline struct sockaddr nsm_addr(const struct nsm_handle handle)
		{
		return (struct sockaddr *)&handle->sm_addr;
		}

		/*
		* Map an fl_owner_t into a unique 32-bit "pid"
		*/