We would like to remove the per-lock-operation nlm_lookup_host() call from
nlmclnt_proc().
The new architecture pins an nlm_host structure to each NFS client
superblock that has the "lock" mount option set. The NFS client passes
in the pinned nlm_host structure during each call to nlmclnt_proc(). NFS
client unmount processing "puts" the nlm_host so it can be garbage-
collected later.
This patch introduces externally callable NLM functions that handle
mount-time nlm_host set up and tear-down.
Signed-off-by: Chuck Lever <[email protected]>
---
fs/lockd/clntlock.c | 48 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/bind.h | 7 ++++++
2 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index d070b18..3e76f79 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -41,6 +41,54 @@ struct nlm_wait {
static LIST_HEAD(nlm_blocked);
+/**
+ * nlmclnt_init - Set up per-NFS mount point lockd data structures
+ * @server_address: server's network address
+ * @server_addrlen: length of server's address
+ * @server_name: server's hostname
+ * @nfs_version: NFS protocol version for this mount point
+ * @protocol: transport protocol lockd should use
+ *
+ * Returns pointer to an appropriate nlm_host struct,
+ * or an ERR_PTR value.
+ */
+struct nlm_host *nlmclnt_init(struct sockaddr *server_address,
+ size_t server_addrlen,
+ char *server_name, u32 nfs_version,
+ unsigned short protocol)
+{
+ struct nlm_host *host;
+ u32 nlm_version = (nfs_version == 2) ? 1 : 4;
+ int status;
+
+ status = lockd_up(protocol);
+ if (status < 0)
+ return ERR_PTR(status);
+
+ host = nlmclnt_lookup_host((struct sockaddr_in *)server_address,
+ protocol, nlm_version,
+ server_name, strlen(server_name));
+ 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
*/
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index 6f1637c..372c8df 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -35,6 +35,13 @@ extern struct nlmsvc_binding * nlmsvc_ops;
/*
* Functions exported by the lockd module
*/
+extern struct nlm_host *nlmclnt_init(struct sockaddr *server_address,
+ size_t server_addrlen,
+ char *server_name,
+ u32 nfs_version,
+ unsigned short protocol);
+extern void nlmclnt_done(struct nlm_host *host);
+
extern int nlmclnt_proc(struct inode *, int, struct file_lock *);
extern int lockd_up(int proto);
extern void lockd_down(void);
On Wed, 2008-01-09 at 12:20 -0500, Chuck Lever wrote:
> We would like to remove the per-lock-operation nlm_lookup_host() call from
> nlmclnt_proc().
>
> The new architecture pins an nlm_host structure to each NFS client
> superblock that has the "lock" mount option set. The NFS client passes
> in the pinned nlm_host structure during each call to nlmclnt_proc(). NFS
> client unmount processing "puts" the nlm_host so it can be garbage-
> collected later.
>
> This patch introduces externally callable NLM functions that handle
> mount-time nlm_host set up and tear-down.
>
> Signed-off-by: Chuck Lever <[email protected]>
> ---
>
> fs/lockd/clntlock.c | 48 ++++++++++++++++++++++++++++++++++++++++++++
> include/linux/lockd/bind.h | 7 ++++++
> 2 files changed, 55 insertions(+), 0 deletions(-)
>
> diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
> index d070b18..3e76f79 100644
> --- a/fs/lockd/clntlock.c
> +++ b/fs/lockd/clntlock.c
> @@ -41,6 +41,54 @@ struct nlm_wait {
>
> static LIST_HEAD(nlm_blocked);
>
> +/**
> + * nlmclnt_init - Set up per-NFS mount point lockd data structures
> + * @server_address: server's network address
> + * @server_addrlen: length of server's address
> + * @server_name: server's hostname
> + * @nfs_version: NFS protocol version for this mount point
> + * @protocol: transport protocol lockd should use
> + *
> + * Returns pointer to an appropriate nlm_host struct,
> + * or an ERR_PTR value.
> + */
> +struct nlm_host *nlmclnt_init(struct sockaddr *server_address,
> + size_t server_addrlen,
> + char *server_name, u32 nfs_version,
> + unsigned short protocol)
Minor nit: that 'protocol' argument looks so lonely and forlorn. How
about grouping it together with the other socket arguments?
In fact, since we have 5 arguments here, perhaps we might consider just
using a structure argument? IIRC gcc is supposed to deal better with
that.
> +{
> + struct nlm_host *host;
> + u32 nlm_version = (nfs_version == 2) ? 1 : 4;
> + int status;
> +
> + status = lockd_up(protocol);
> + if (status < 0)
> + return ERR_PTR(status);
> +
> + host = nlmclnt_lookup_host((struct sockaddr_in *)server_address,
> + protocol, nlm_version,
> + server_name, strlen(server_name));
> + 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
> */
> diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
> index 6f1637c..372c8df 100644
> --- a/include/linux/lockd/bind.h
> +++ b/include/linux/lockd/bind.h
> @@ -35,6 +35,13 @@ extern struct nlmsvc_binding * nlmsvc_ops;
> /*
> * Functions exported by the lockd module
> */
> +extern struct nlm_host *nlmclnt_init(struct sockaddr *server_address,
> + size_t server_addrlen,
> + char *server_name,
> + u32 nfs_version,
> + unsigned short protocol);
> +extern void nlmclnt_done(struct nlm_host *host);
> +
> extern int nlmclnt_proc(struct inode *, int, struct file_lock *);
> extern int lockd_up(int proto);
> extern void lockd_down(void);
>