git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NSM: Move nsm_addr() to fs/lockd/mon.c
[safe/jmp/linux-2.6]
/
fs
/
lockd
/
mon.c
diff --git
a/fs/lockd/mon.c
b/fs/lockd/mon.c
index
8ae4c02
..
43be31c
100644
(file)
--- 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/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
#define NLMDBG_FACILITY NLMDBG_MONITOR
#define NSM_PROGRAM 100024
@@
-57,6
+55,11
@@
static DEFINE_SPINLOCK(nsm_lock);
*/
int nsm_local_state;
*/
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)
{
static void nsm_display_ipv4_address(const struct sockaddr *sap, char *buf,
const size_t len)
{