X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Flockd%2Fmon.c;h=43be31c4a2deb57f73b5d364ac04cfe927c9b1f2;hb=8529bc51d30b8f001734b29b21a51b579c260f5b;hp=8ae4c02d7dfda7e8ab60154e5975de496749d7da;hpb=94da7663db26530a8377f7219f8be8bd4d4822c2;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 8ae4c02..43be31c 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -15,8 +15,6 @@
 #include <linux/sunrpc/xprtsock.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
-#include <linux/lockd/sm_inter.h>
-
 
 #define NLMDBG_FACILITY		NLMDBG_MONITOR
 #define NSM_PROGRAM		100024
@@ -57,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)
 {