remove unused include/asm-generic/dma-mapping.h

[safe/jmp/linux-2.6] / fs / lockd / mon.c

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 99aec74..5e2c4d5 100644 (file)
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -9,12 +9,12 @@
 #include <linux/types.h>
 #include <linux/utsname.h>
 #include <linux/kernel.h>
+#include <linux/ktime.h>
+
 #include <linux/sunrpc/clnt.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
@@ -44,8 +44,6 @@ struct nsm_res {
        u32                     state;
 };
 
-static struct rpc_clnt *       nsm_create(void);
-
 static struct rpc_program      nsm_program;
 static                         LIST_HEAD(nsm_handles);
 static                         DEFINE_SPINLOCK(nsm_lock);
@@ -53,7 +51,13 @@ static                               DEFINE_SPINLOCK(nsm_lock);
 /*
  * Local NSM state
  */
-int                            nsm_local_state;
+int    __read_mostly           nsm_local_state;
+int    __read_mostly           nsm_use_hostnames;
+
+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)
@@ -92,11 +96,26 @@ static void nsm_display_address(const struct sockaddr *sap,
        }
 }
 
-/*
- * Common procedure for NSMPROC_MON/NSMPROC_UNMON calls
- */
-static int
-nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
+static struct rpc_clnt *nsm_create(void)
+{
+       struct sockaddr_in sin = {
+               .sin_family             = AF_INET,
+               .sin_addr.s_addr        = htonl(INADDR_LOOPBACK),
+       };
+       struct rpc_create_args args = {
+               .protocol               = XPRT_TRANSPORT_UDP,
+               .address                = (struct sockaddr *)&sin,
+               .addrsize               = sizeof(sin),
+               .servername             = "rpc.statd",
+               .program                = &nsm_program,
+               .version                = NSM_VERSION,
+               .authflavor             = RPC_AUTH_NULL,
+       };
+
+       return rpc_create(&args);
+}
+
+static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
 {
        struct rpc_clnt *clnt;
        int             status;
@@ -240,13 +259,25 @@ static struct nsm_handle *nsm_lookup_priv(const struct nsm_private *priv)
  * returned via NLMPROC_SM_NOTIFY, in the "priv" field of these
  * requests.
  *
- * Linux provides the raw IP address of the monitored host,
- * left in network byte order.
+ * The NSM protocol requires that these cookies be unique while the
+ * system is running.  We prefer a stronger requirement of making them
+ * unique across reboots.  If user space bugs cause a stale cookie to
+ * be sent to the kernel, it could cause the wrong host to lose its
+ * lock state if cookies were not unique across reboots.
+ *
+ * The cookies are exposed only to local user space via loopback.  They
+ * do not appear on the physical network.  If we want greater security
+ * for some reason, nsm_init_private() could perform a one-way hash to
+ * obscure the contents of the cookie.
  */
 static void nsm_init_private(struct nsm_handle *nsm)
 {
-       __be32 *p = (__be32 *)&nsm->sm_priv.data;
-       *p = nsm_addr_in(nsm)->sin_addr.s_addr;
+       u64 *p = (u64 *)&nsm->sm_priv.data;
+       struct timespec ts;
+
+       ktime_get_ts(&ts);
+       *p++ = timespec_to_ns(&ts);
+       *p = (unsigned long)nsm;
 }
 
 static struct nsm_handle *nsm_create_handle(const struct sockaddr *sap,
@@ -351,11 +382,7 @@ struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info)
 
        spin_lock(&nsm_lock);
 
-       if (nsm_use_hostnames && info->mon != NULL)
-               cached = nsm_lookup_hostname(info->mon, info->len);
-       else
-               cached = nsm_lookup_priv(&info->priv);
-
+       cached = nsm_lookup_priv(&info->priv);
        if (unlikely(cached == NULL)) {
                spin_unlock(&nsm_lock);
                dprintk("lockd: never saw rebooted peer '%.*s' before\n",
@@ -395,30 +422,6 @@ void nsm_release(struct nsm_handle *nsm)
 }
 
 /*
- * Create NSM client for the local host
- */
-static struct rpc_clnt *
-nsm_create(void)
-{
-       struct sockaddr_in      sin = {
-               .sin_family     = AF_INET,
-               .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
-               .sin_port       = 0,
-       };
-       struct rpc_create_args args = {
-               .protocol       = XPRT_TRANSPORT_UDP,
-               .address        = (struct sockaddr *)&sin,
-               .addrsize       = sizeof(sin),
-               .servername     = "localhost",
-               .program        = &nsm_program,
-               .version        = NSM_VERSION,
-               .authflavor     = RPC_AUTH_NULL,
-       };
-
-       return rpc_create(&args);
-}
-
-/*
  * XDR functions for NSM.
  *
  * See http://www.opengroup.org/ for details on the Network