5 files changed, 17 insertions, 7 deletions

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index a2717408c478..0796c45d0d4d 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -11,7 +11,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/nfs_fs.h>
-#include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/addr.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
 #include <linux/kthread.h>
@@ -220,10 +220,19 @@ reclaimer(void *ptr)
 {
         struct nlm_host   *host = (struct nlm_host *) ptr;
         struct nlm_wait   *block;
+        struct nlm_rqst   *req;
         struct file_lock *fl, *next;
         u32 nsmstate;
         struct net *net = host->net;
 
+        req = kmalloc(sizeof(*req), GFP_KERNEL);
+        if (!req) {
+                printk(KERN_ERR "lockd: reclaimer unable to alloc memory."
+                                " Locks for %s won't be reclaimed!\n",
+                                host->h_name);
+                return 0;
+        }
+
         allow_signal(SIGKILL);
 
         down_write(&host->h_rwsem);
@@ -253,7 +262,7 @@ restart:
                  */
                 if (signalled())
                         continue;
-                if (nlmclnt_reclaim(host, fl) != 0)
+                if (nlmclnt_reclaim(host, fl, req) != 0)
                         continue;
                 list_add_tail(&fl->fl_u.nfs_fl.list, &host->h_granted);
                 if (host->h_nsmstate != nsmstate) {
@@ -279,5 +288,6 @@ restart:
         /* Release host handle after use */
         nlmclnt_release_host(host);
         lockd_down(net);
+        kfree(req);
         return 0;
 }
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 366277190b82..7e529c3c45c0 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -618,17 +618,15 @@ out_unlock:
  * RECLAIM: Try to reclaim a lock
  */
 int
-nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl)
+nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl,
+                struct nlm_rqst *req)
 {
-        struct nlm_rqst reqst, *req;
         int             status;
 
-        req = &reqst;
         memset(req, 0, sizeof(*req));
         locks_init_lock(&req->a_args.lock.fl);
         locks_init_lock(&req->a_res.lock.fl);
         req->a_host  = host;
-        req->a_flags = 0;
 
         /* Set up the argument struct */
         nlmclnt_setlockargs(req, fl);
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index abdd75d44dd4..969d589c848d 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -13,6 +13,7 @@
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/addr.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
 #include <linux/mutex.h>
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 3c2cfc683631..1812f026960c 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -12,6 +12,7 @@
 #include <linux/slab.h>
 
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/addr.h>
 #include <linux/sunrpc/xprtsock.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index d17bb62b06d6..97e87415b145 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -13,7 +13,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/addr.h>
 #include <linux/nfsd/nfsfh.h>
 #include <linux/nfsd/export.h>
 #include <linux/lockd/lockd.h>