x86: rename PTE_MASK to PTE_PFN_MASK

[linux-2.6-omap-h63xx.git] / fs / lockd / clntlock.c

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index f4d45d4d835b9ff77531d896ababeecf6b090f5d..0b45fd3a4bfd6dfdb9e6e8d426a46489954822bb 100644 (file)
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -41,6 +41,48 @@ struct nlm_wait {
 
 static LIST_HEAD(nlm_blocked);
 
+/**
+ * nlmclnt_init - Set up per-NFS mount point lockd data structures
+ * @nlm_init: pointer to arguments structure
+ *
+ * Returns pointer to an appropriate nlm_host struct,
+ * or an ERR_PTR value.
+ */
+struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init)
+{
+       struct nlm_host *host;
+       u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4;
+       int status;
+
+       status = lockd_up(nlm_init->protocol);
+       if (status < 0)
+               return ERR_PTR(status);
+
+       host = nlmclnt_lookup_host((struct sockaddr_in *)nlm_init->address,
+                                  nlm_init->protocol, nlm_version,
+                                  nlm_init->hostname,
+                                  strlen(nlm_init->hostname));
+       if (host == NULL) {
+               lockd_down();
+               return ERR_PTR(-ENOLCK);
+       }
+
+       return host;
+}
+EXPORT_SYMBOL_GPL(nlmclnt_init);
+
+/**
+ * nlmclnt_done - Release resources allocated by nlmclnt_init()
+ * @host: nlm_host structure reserved by nlmclnt_init()
+ *
+ */
+void nlmclnt_done(struct nlm_host *host)
+{
+       nlm_release_host(host);
+       lockd_down();
+}
+EXPORT_SYMBOL_GPL(nlmclnt_done);
+
 /*
  * Queue up a lock for blocking so that the GRANTED request can see it
  */
@@ -153,7 +195,7 @@ nlmclnt_recovery(struct nlm_host *host)
        if (!host->h_reclaiming++) {
                nlm_get_host(host);
                __module_get(THIS_MODULE);
-               if (kernel_thread(reclaimer, host, CLONE_KERNEL) < 0)
+               if (kernel_thread(reclaimer, host, CLONE_FS | CLONE_FILES) < 0)
                        module_put(THIS_MODULE);
        }
 }