1093a60ef3
Now that each NFS mount point caches its own nlm_host structure, it can be passed to nlmclnt_proc() for each lock request. By pinning an nlm_host for each mount point, we trade the overhead of looking up or creating a fresh nlm_host struct during every NLM procedure call for a little extra memory. We also restrict the nlmclnt_proc symbol to limit the use of this call to in-tree modules. Note that nlm_lookup_host() (just removed from the client's per-request NLM processing) could also trigger an nlm_host garbage collection. Now client-side nlm_host garbage collection occurs only during NFS mount processing. Since the NFS client now holds a reference on these nlm_host structures, they wouldn't have been affected by garbage collection anyway. Given that nlm_lookup_host() reorders the global nlm_host chain after every successful lookup, and that a garbage collection could be triggered during the call, we've removed a significant amount of per-NLM-request CPU processing overhead. Sidebar: there are only a few remaining references to the internals of NFS inodes in the client-side NLM code. The only references I found are related to extracting or comparing the inode's file handle via NFS_FH(). One is in nlmclnt_grant(); the other is in nlmclnt_setlockargs(). Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
59 lines
1.4 KiB
C
59 lines
1.4 KiB
C
/*
|
|
* linux/include/linux/lockd/bind.h
|
|
*
|
|
* This is the part of lockd visible to nfsd and the nfs client.
|
|
*
|
|
* Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
|
|
*/
|
|
|
|
#ifndef LINUX_LOCKD_BIND_H
|
|
#define LINUX_LOCKD_BIND_H
|
|
|
|
#include <linux/lockd/nlm.h>
|
|
/* need xdr-encoded error codes too, so... */
|
|
#include <linux/lockd/xdr.h>
|
|
#ifdef CONFIG_LOCKD_V4
|
|
#include <linux/lockd/xdr4.h>
|
|
#endif
|
|
|
|
/* Dummy declarations */
|
|
struct svc_rqst;
|
|
|
|
/*
|
|
* This is the set of functions for lockd->nfsd communication
|
|
*/
|
|
struct nlmsvc_binding {
|
|
__be32 (*fopen)(struct svc_rqst *,
|
|
struct nfs_fh *,
|
|
struct file **);
|
|
void (*fclose)(struct file *);
|
|
unsigned long (*get_grace_period)(void);
|
|
};
|
|
|
|
extern struct nlmsvc_binding * nlmsvc_ops;
|
|
|
|
/*
|
|
* Functions exported by the lockd module
|
|
*/
|
|
extern struct nlm_host *nlmclnt_init(const char *server_name,
|
|
const struct sockaddr *server_address,
|
|
size_t server_addrlen,
|
|
unsigned short protocol,
|
|
u32 nfs_version);
|
|
extern void nlmclnt_done(struct nlm_host *host);
|
|
|
|
extern int nlmclnt_proc(struct nlm_host *host, int cmd,
|
|
struct file_lock *fl);
|
|
extern int lockd_up(int proto);
|
|
extern void lockd_down(void);
|
|
|
|
unsigned long get_nfs_grace_period(void);
|
|
|
|
#ifdef CONFIG_NFSD_V4
|
|
unsigned long get_nfs4_grace_period(void);
|
|
#else
|
|
static inline unsigned long get_nfs4_grace_period(void) {return 0;}
|
|
#endif
|
|
|
|
#endif /* LINUX_LOCKD_BIND_H */
|