Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 79 insertions, 0 deletions

diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
new file mode 100644
index 000000000000..7b889ff15ae6
--- /dev/null
+++ b/fs/nfsd/lockd.c
@@ -0,0 +1,79 @@
+/*
+ * linux/fs/nfsd/lockd.c
+ *
+ * This file contains all the stubs needed when communicating with lockd.
+ * This level of indirection is necessary so we can run nfsd+lockd without
+ * requiring the nfs client to be compiled in/loaded, and vice versa.
+ *
+ * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
+ */
+
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/file.h>
+#include <linux/mount.h>
+#include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/svc.h>
+#include <linux/nfsd/nfsd.h>
+#include <linux/lockd/bind.h>
+
+#define NFSDDBG_FACILITY                NFSDDBG_LOCKD
+
+/*
+ * Note: we hold the dentry use count while the file is open.
+ */
+static u32
+nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp)
+{
+        u32             nfserr;
+        struct svc_fh   fh;
+
+        /* must initialize before using! but maxsize doesn't matter */
+        fh_init(&fh,0);
+        fh.fh_handle.fh_size = f->size;
+        memcpy((char*)&fh.fh_handle.fh_base, f->data, f->size);
+        fh.fh_export = NULL;
+
+        exp_readlock();
+        nfserr = nfsd_open(rqstp, &fh, S_IFREG, MAY_LOCK, filp);
+        fh_put(&fh);
+        rqstp->rq_client = NULL;
+        exp_readunlock();
+        /* nlm and nfsd don't share error codes.
+         * we invent: 0 = no error
+         *            1 = stale file handle
+         *            2 = other error
+         */
+        switch (nfserr) {
+        case nfs_ok:
+                return 0;
+        case nfserr_stale:
+                return 1;
+        default:
+                return 2;
+        }
+}
+
+static void
+nlm_fclose(struct file *filp)
+{
+        fput(filp);
+}
+
+static struct nlmsvc_binding    nfsd_nlm_ops = {
+        .fopen          = nlm_fopen,            /* open file for locking */
+        .fclose         = nlm_fclose,           /* close file */
+};
+
+void
+nfsd_lockd_init(void)
+{
+        dprintk("nfsd: initializing lockd\n");
+        nlmsvc_ops = &nfsd_nlm_ops;
+}
+
+void
+nfsd_lockd_shutdown(void)
+{
+        nlmsvc_ops = NULL;
+}