Commit 151ddf2e authored by Neil Brown's avatar Neil Brown Committed by David S. Miller

[PATCH] kNFSd 3: Increase separation between lockd and nfsd.

lockd currently asks nfsd for a 'client handle' for each
request.

This is used as a key for finding (or creating) a 'nlm_host'
structure, so that there is only one of these per client...almost.
There can currently be up to 4 nlm_hosts for a given client,
depending on protocol (udp/tcp) or version (v1 or v4).

But this isn't handled very well.

So the question is: is there any advantage in having only on
nlm_host per real host, or have we simply have one for each IP
address that makes requests, whether they are separate hosts or not.

The nlm_host structure is used:
 1/ to hold a lockd rpc client for talking to the
    remote lockd.  Having multiple lockd clients cannot hurt
    except possibly to waste a little space.
 2/ to identify resources to free when we receive notification
    from statd that a client has restarted.
    As statd gets a hostname and looks up all IP addresses,
    and then sends a notification for each IP for which it has
    a registration, there is no need to minimise the number
    of nlm_host structures (each of which register for monitoring).
 3/ to identify resources to free when a client sends a
    "free_all" request.  If a client uses multiple IP addresses to
    create locks, and then sends free_all from just one IP address
    we will loose here.
    However it is not clear that a client would ever want to send
    a free_all request, and the linux client doesn't seem to, so
    there is unlikely to be any loss here.

This patch does not ask nfsd for a client identifier, but rather
finds an nlm_host based on IP, version, protocol (udp/tcp) and
whether we are acting as NFS server or client.

All of this information is then placed in the cookie that is
passed to statd and returned by statd when the client restarts.
Previously only the IP address was passing the cookie, so possibly
not all nlm_host structures would have been found.

Because of these changes, lockd does not need to know
anything about the nfsd export table, so the interface to
nfsd is much more narrow.

Another consequence is that when nfsd is told to delete a client,
it cannot tell lockd to forget all the locks for that client.
However it is not clear that lockd should ever forget any locks
unless it is told to shutdown (or simulate a shutdown), and in
anycase, the current nfsd admin tools never tell nfsd to delete
a client anyway.
parent f96e7cb1
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#define NLM_HOST_MAX 64 #define NLM_HOST_MAX 64
#define NLM_HOST_NRHASH 32 #define NLM_HOST_NRHASH 32
#define NLM_ADDRHASH(addr) (ntohl(addr) & (NLM_HOST_NRHASH-1)) #define NLM_ADDRHASH(addr) (ntohl(addr) & (NLM_HOST_NRHASH-1))
#define NLM_PTRHASH(ptr) ((((u32)(unsigned long) ptr) / 32) & (NLM_HOST_NRHASH-1))
#define NLM_HOST_REBIND (60 * HZ) #define NLM_HOST_REBIND (60 * HZ)
#define NLM_HOST_EXPIRE ((nrhosts > NLM_HOST_MAX)? 300 * HZ : 120 * HZ) #define NLM_HOST_EXPIRE ((nrhosts > NLM_HOST_MAX)? 300 * HZ : 120 * HZ)
#define NLM_HOST_COLLECT ((nrhosts > NLM_HOST_MAX)? 120 * HZ : 60 * HZ) #define NLM_HOST_COLLECT ((nrhosts > NLM_HOST_MAX)? 120 * HZ : 60 * HZ)
...@@ -42,7 +41,7 @@ static void nlm_gc_hosts(void); ...@@ -42,7 +41,7 @@ static void nlm_gc_hosts(void);
struct nlm_host * struct nlm_host *
nlmclnt_lookup_host(struct sockaddr_in *sin, int proto, int version) nlmclnt_lookup_host(struct sockaddr_in *sin, int proto, int version)
{ {
return nlm_lookup_host(NULL, sin, proto, version); return nlm_lookup_host(0, sin, proto, version);
} }
/* /*
...@@ -51,45 +50,25 @@ nlmclnt_lookup_host(struct sockaddr_in *sin, int proto, int version) ...@@ -51,45 +50,25 @@ nlmclnt_lookup_host(struct sockaddr_in *sin, int proto, int version)
struct nlm_host * struct nlm_host *
nlmsvc_lookup_host(struct svc_rqst *rqstp) nlmsvc_lookup_host(struct svc_rqst *rqstp)
{ {
return nlm_lookup_host(rqstp->rq_client, &rqstp->rq_addr, return nlm_lookup_host(1, &rqstp->rq_addr,
rqstp->rq_prot, rqstp->rq_vers); rqstp->rq_prot, rqstp->rq_vers);
} }
/*
* Match the given host against client/address
*/
static inline int
nlm_match_host(struct nlm_host *host, struct svc_client *clnt,
struct sockaddr_in *sin)
{
if (clnt)
return host->h_exportent == clnt;
return nlm_cmp_addr(&host->h_addr, sin);
}
/* /*
* Common host lookup routine for server & client * Common host lookup routine for server & client
*/ */
struct nlm_host * struct nlm_host *
nlm_lookup_host(struct svc_client *clnt, struct sockaddr_in *sin, nlm_lookup_host(int server, struct sockaddr_in *sin,
int proto, int version) int proto, int version)
{ {
struct nlm_host *host, **hp; struct nlm_host *host, **hp;
u32 addr; u32 addr;
int hash; int hash;
if (!clnt && !sin) {
printk(KERN_NOTICE "lockd: no clnt or addr in lookup_host!\n");
return NULL;
}
dprintk("lockd: nlm_lookup_host(%08x, p=%d, v=%d)\n", dprintk("lockd: nlm_lookup_host(%08x, p=%d, v=%d)\n",
(unsigned)(sin? ntohl(sin->sin_addr.s_addr) : 0), proto, version); (unsigned)(sin? ntohl(sin->sin_addr.s_addr) : 0), proto, version);
if (clnt) hash = NLM_ADDRHASH(sin->sin_addr.s_addr);
hash = NLM_PTRHASH(clnt);
else
hash = NLM_ADDRHASH(sin->sin_addr.s_addr);
/* Lock hash table */ /* Lock hash table */
down(&nlm_host_sema); down(&nlm_host_sema);
...@@ -98,12 +77,14 @@ nlm_lookup_host(struct svc_client *clnt, struct sockaddr_in *sin, ...@@ -98,12 +77,14 @@ nlm_lookup_host(struct svc_client *clnt, struct sockaddr_in *sin,
nlm_gc_hosts(); nlm_gc_hosts();
for (hp = &nlm_hosts[hash]; (host = *hp); hp = &host->h_next) { for (hp = &nlm_hosts[hash]; (host = *hp); hp = &host->h_next) {
if (proto && host->h_proto != proto) if (host->h_proto != proto)
continue;
if (host->h_version != version)
continue; continue;
if (version && host->h_version != version) if (host->h_server != server)
continue; continue;
if (nlm_match_host(host, clnt, sin)) { if (nlm_cmp_addr(&host->h_addr, sin)) {
if (hp != nlm_hosts + hash) { if (hp != nlm_hosts + hash) {
*hp = host->h_next; *hp = host->h_next;
host->h_next = nlm_hosts[hash]; host->h_next = nlm_hosts[hash];
...@@ -115,10 +96,6 @@ nlm_lookup_host(struct svc_client *clnt, struct sockaddr_in *sin, ...@@ -115,10 +96,6 @@ nlm_lookup_host(struct svc_client *clnt, struct sockaddr_in *sin,
} }
} }
/* special hack for nlmsvc_invalidate_client */
if (sin == NULL)
goto nohost;
/* Ooops, no host found, create it */ /* Ooops, no host found, create it */
dprintk("lockd: creating host entry\n"); dprintk("lockd: creating host entry\n");
...@@ -146,8 +123,7 @@ nlm_lookup_host(struct svc_client *clnt, struct sockaddr_in *sin, ...@@ -146,8 +123,7 @@ nlm_lookup_host(struct svc_client *clnt, struct sockaddr_in *sin,
init_waitqueue_head(&host->h_gracewait); init_waitqueue_head(&host->h_gracewait);
host->h_state = 0; /* pseudo NSM state */ host->h_state = 0; /* pseudo NSM state */
host->h_nsmstate = 0; /* real NSM state */ host->h_nsmstate = 0; /* real NSM state */
host->h_exportent = clnt; host->h_server = server;
host->h_next = nlm_hosts[hash]; host->h_next = nlm_hosts[hash];
nlm_hosts[hash] = host; nlm_hosts[hash] = host;
...@@ -170,7 +146,7 @@ nlm_find_client(void) ...@@ -170,7 +146,7 @@ nlm_find_client(void)
for (hash = 0 ; hash < NLM_HOST_NRHASH; hash++) { for (hash = 0 ; hash < NLM_HOST_NRHASH; hash++) {
struct nlm_host *host, **hp; struct nlm_host *host, **hp;
for (hp = &nlm_hosts[hash]; (host = *hp) ; hp = &host->h_next) { for (hp = &nlm_hosts[hash]; (host = *hp) ; hp = &host->h_next) {
if (host->h_exportent != NULL && if (host->h_server &&
host->h_killed == 0) { host->h_killed == 0) {
nlm_get_host(host); nlm_get_host(host);
up(&nlm_host_sema); up(&nlm_host_sema);
......
...@@ -32,7 +32,6 @@ EXPORT_SYMBOL(lockd_down); ...@@ -32,7 +32,6 @@ EXPORT_SYMBOL(lockd_down);
EXPORT_SYMBOL(nlmclnt_proc); EXPORT_SYMBOL(nlmclnt_proc);
/* NFS server entry points/hooks */ /* NFS server entry points/hooks */
EXPORT_SYMBOL(nlmsvc_invalidate_client);
EXPORT_SYMBOL(nlmsvc_ops); EXPORT_SYMBOL(nlmsvc_ops);
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
...@@ -42,6 +42,7 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res) ...@@ -42,6 +42,7 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res)
goto out; goto out;
args.addr = host->h_addr.sin_addr.s_addr; args.addr = host->h_addr.sin_addr.s_addr;
args.proto= (host->h_proto<<1) | host->h_server;
args.prog = NLM_PROGRAM; args.prog = NLM_PROGRAM;
args.vers = host->h_version; args.vers = host->h_version;
args.proc = NLMPROC_NSM_NOTIFY; args.proc = NLMPROC_NSM_NOTIFY;
...@@ -167,8 +168,8 @@ xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) ...@@ -167,8 +168,8 @@ xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
/* This is the private part. Needed only for SM_MON call */ /* This is the private part. Needed only for SM_MON call */
if (rqstp->rq_task->tk_msg.rpc_proc == SM_MON) { if (rqstp->rq_task->tk_msg.rpc_proc == SM_MON) {
*p++ = argp->addr; *p++ = argp->addr;
*p++ = 0; *p++ = argp->vers;
*p++ = 0; *p++ = argp->proto;
*p++ = 0; *p++ = 0;
} }
......
...@@ -163,22 +163,8 @@ lockd(struct svc_rqst *rqstp) ...@@ -163,22 +163,8 @@ lockd(struct svc_rqst *rqstp)
dprintk("lockd: request from %08x\n", dprintk("lockd: request from %08x\n",
(unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr)); (unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr));
/*
* Look up the NFS client handle. The handle is needed for
* all but the GRANTED callback RPCs.
*/
rqstp->rq_client = NULL;
if (nlmsvc_ops) {
nlmsvc_ops->exp_readlock();
rqstp->rq_client =
nlmsvc_ops->exp_getclient(&rqstp->rq_addr);
}
svc_process(serv, rqstp); svc_process(serv, rqstp);
/* Unlock export hash tables */
if (nlmsvc_ops)
nlmsvc_ops->exp_unlock();
} }
/* /*
......
...@@ -40,15 +40,6 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -40,15 +40,6 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,
if (!nlmsvc_ops) if (!nlmsvc_ops)
return nlm_lck_denied_nolocks; return nlm_lck_denied_nolocks;
/* Obtain handle for client host */
if (rqstp->rq_client == NULL) {
printk(KERN_NOTICE
"lockd: unauthenticated request from (%08x:%d)\n",
ntohl(rqstp->rq_addr.sin_addr.s_addr),
ntohs(rqstp->rq_addr.sin_port));
return nlm_lck_denied_nolocks;
}
/* Obtain host handle */ /* Obtain host handle */
if (!(host = nlmsvc_lookup_host(rqstp)) if (!(host = nlmsvc_lookup_host(rqstp))
|| (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0)) || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))
...@@ -420,8 +411,9 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, ...@@ -420,8 +411,9 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
void *resp) void *resp)
{ {
struct sockaddr_in saddr = rqstp->rq_addr; struct sockaddr_in saddr = rqstp->rq_addr;
int vers = rqstp->rq_vers; int vers = argp->vers;
int prot = rqstp->rq_prot; int prot = argp->proto >> 1;
struct nlm_host *host; struct nlm_host *host;
dprintk("lockd: SM_NOTIFY called\n"); dprintk("lockd: SM_NOTIFY called\n");
...@@ -438,24 +430,20 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, ...@@ -438,24 +430,20 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
* reclaim all locks we hold on this server. * reclaim all locks we hold on this server.
*/ */
saddr.sin_addr.s_addr = argp->addr; saddr.sin_addr.s_addr = argp->addr;
if ((host = nlmclnt_lookup_host(&saddr, prot, vers)) != NULL) {
nlmclnt_recovery(host, argp->state);
nlm_release_host(host);
}
/* If we run on an NFS server, delete all locks held by the client */ if ((argp->proto & 1)==0) {
if (nlmsvc_ops != NULL) { if ((host = nlmclnt_lookup_host(&saddr, prot, vers)) != NULL) {
struct svc_client *clnt; nlmclnt_recovery(host, argp->state);
saddr.sin_addr.s_addr = argp->addr; nlm_release_host(host);
nlmsvc_ops->exp_readlock(); }
if ((clnt = nlmsvc_ops->exp_getclient(&saddr)) != NULL } else {
&& (host = nlm_lookup_host(clnt, &saddr, 0, 0)) != NULL) { /* If we run on an NFS server, delete all locks held by the client */
if ((host = nlm_lookup_host(1, &saddr, prot, vers)) != NULL) {
nlmsvc_free_host_resources(host); nlmsvc_free_host_resources(host);
nlm_release_host(host);
} }
nlm_release_host(host);
nlmsvc_ops->exp_unlock();
} }
return rpc_success; return rpc_success;
} }
......
...@@ -69,15 +69,6 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -69,15 +69,6 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,
if (!nlmsvc_ops) if (!nlmsvc_ops)
return nlm_lck_denied_nolocks; return nlm_lck_denied_nolocks;
/* Obtain handle for client host */
if (rqstp->rq_client == NULL) {
printk(KERN_NOTICE
"lockd: unauthenticated request from (%08x:%d)\n",
ntohl(rqstp->rq_addr.sin_addr.s_addr),
ntohs(rqstp->rq_addr.sin_port));
return nlm_lck_denied_nolocks;
}
/* Obtain host handle */ /* Obtain host handle */
if (!(host = nlmsvc_lookup_host(rqstp)) if (!(host = nlmsvc_lookup_host(rqstp))
|| (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0)) || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))
...@@ -448,8 +439,8 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, ...@@ -448,8 +439,8 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
void *resp) void *resp)
{ {
struct sockaddr_in saddr = rqstp->rq_addr; struct sockaddr_in saddr = rqstp->rq_addr;
int vers = rqstp->rq_vers; int vers = argp->vers;
int prot = rqstp->rq_prot; int prot = argp->proto >> 1;
struct nlm_host *host; struct nlm_host *host;
dprintk("lockd: SM_NOTIFY called\n"); dprintk("lockd: SM_NOTIFY called\n");
...@@ -466,22 +457,17 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, ...@@ -466,22 +457,17 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
* reclaim all locks we hold on this server. * reclaim all locks we hold on this server.
*/ */
saddr.sin_addr.s_addr = argp->addr; saddr.sin_addr.s_addr = argp->addr;
if ((host = nlmclnt_lookup_host(&saddr, prot, vers)) != NULL) { if ((argp->proto & 1)==0) {
nlmclnt_recovery(host, argp->state); if ((host = nlmclnt_lookup_host(&saddr, prot, vers)) != NULL) {
nlm_release_host(host); nlmclnt_recovery(host, argp->state);
} nlm_release_host(host);
}
/* If we run on an NFS server, delete all locks held by the client */ } else {
if (nlmsvc_ops != NULL) { /* If we run on an NFS server, delete all locks held by the client */
struct svc_client *clnt; if ((host = nlm_lookup_host(1, &saddr, prot, vers)) != NULL) {
saddr.sin_addr.s_addr = argp->addr;
nlmsvc_ops->exp_readlock();
if ((clnt = nlmsvc_ops->exp_getclient(&saddr)) != NULL
&& (host = nlm_lookup_host(clnt, &saddr, 0, 0)) != NULL) {
nlmsvc_free_host_resources(host); nlmsvc_free_host_resources(host);
nlm_release_host(host);
} }
nlm_release_host(host);
nlmsvc_ops->exp_unlock();
} }
return rpc_success; return rpc_success;
......
...@@ -293,23 +293,6 @@ nlmsvc_free_host_resources(struct nlm_host *host) ...@@ -293,23 +293,6 @@ nlmsvc_free_host_resources(struct nlm_host *host)
host->h_name); host->h_name);
} }
/*
* Delete a client when the nfsd entry is removed.
*/
void
nlmsvc_invalidate_client(struct svc_client *clnt)
{
struct nlm_host *host;
if ((host = nlm_lookup_host(clnt, NULL, 0, 0)) != NULL) {
dprintk("lockd: invalidating client for %s\n", host->h_name);
nlmsvc_free_host_resources(host);
host->h_expires = 0;
host->h_killed = 1;
nlm_release_host(host);
}
}
/* /*
* delete all hosts structs for clients * delete all hosts structs for clients
*/ */
......
...@@ -369,6 +369,8 @@ nlmsvc_decode_reboot(struct svc_rqst *rqstp, u32 *p, struct nlm_reboot *argp) ...@@ -369,6 +369,8 @@ nlmsvc_decode_reboot(struct svc_rqst *rqstp, u32 *p, struct nlm_reboot *argp)
argp->state = ntohl(*p++); argp->state = ntohl(*p++);
/* Preserve the address in network byte order */ /* Preserve the address in network byte order */
argp->addr = *p++; argp->addr = *p++;
argp->vers = *p++;
argp->proto = *p++;
return xdr_argsize_check(rqstp, p); return xdr_argsize_check(rqstp, p);
} }
......
...@@ -840,7 +840,6 @@ exp_freeclient(svc_client *clp) ...@@ -840,7 +840,6 @@ exp_freeclient(svc_client *clp)
/* umap_free(&(clp->cl_umap)); */ /* umap_free(&(clp->cl_umap)); */
exp_unexport_all(clp); exp_unexport_all(clp);
nfsd_lockd_unexport(clp);
kfree (clp); kfree (clp);
} }
......
...@@ -31,12 +31,19 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file *filp) ...@@ -31,12 +31,19 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file *filp)
memcpy((char*)&fh.fh_handle.fh_base, f->data, f->size); memcpy((char*)&fh.fh_handle.fh_base, f->data, f->size);
fh.fh_export = NULL; fh.fh_export = NULL;
nfserr = nfsd_open(rqstp, &fh, S_IFREG, MAY_LOCK, filp); exp_readlock();
rqstp->rq_client = exp_getclient(&rqstp->rq_addr);
if (rqstp->rq_client == NULL)
nfserr = nfserr_stale;
else
nfserr = nfsd_open(rqstp, &fh, S_IFREG, MAY_LOCK, filp);
if (!nfserr) { if (!nfserr) {
dget(filp->f_dentry); dget(filp->f_dentry);
mntget(filp->f_vfsmnt); mntget(filp->f_vfsmnt);
} }
fh_put(&fh); fh_put(&fh);
rqstp->rq_client = NULL;
exp_readunlock();
/* nlm and nfsd don't share error codes. /* nlm and nfsd don't share error codes.
* we invent: 0 = no error * we invent: 0 = no error
* 1 = stale file handle * 1 = stale file handle
...@@ -61,23 +68,10 @@ nlm_fclose(struct file *filp) ...@@ -61,23 +68,10 @@ nlm_fclose(struct file *filp)
} }
struct nlmsvc_binding nfsd_nlm_ops = { struct nlmsvc_binding nfsd_nlm_ops = {
.exp_readlock = exp_readlock, /* lock export table for reading */
.exp_unlock = exp_readunlock, /* unlock export table */
.exp_getclient = exp_getclient, /* look up NFS client */
.fopen = nlm_fopen, /* open file for locking */ .fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */ .fclose = nlm_fclose, /* close file */
}; };
/*
* When removing an NFS client entry, notify lockd that it is gone.
* FIXME: We should do the same when unexporting an NFS volume.
*/
void
nfsd_lockd_unexport(struct svc_client *clnt)
{
nlmsvc_invalidate_client(clnt);
}
void void
nfsd_lockd_init(void) nfsd_lockd_init(void)
{ {
......
...@@ -19,9 +19,6 @@ struct svc_client; /* opaque type */ ...@@ -19,9 +19,6 @@ struct svc_client; /* opaque type */
* This is the set of functions for lockd->nfsd communication * This is the set of functions for lockd->nfsd communication
*/ */
struct nlmsvc_binding { struct nlmsvc_binding {
void (*exp_readlock)(void);
void (*exp_unlock)(void);
struct svc_client * (*exp_getclient)(struct sockaddr_in *);
u32 (*fopen)(struct svc_rqst *, u32 (*fopen)(struct svc_rqst *,
struct nfs_fh *, struct nfs_fh *,
struct file *); struct file *);
...@@ -33,7 +30,6 @@ extern struct nlmsvc_binding * nlmsvc_ops; ...@@ -33,7 +30,6 @@ extern struct nlmsvc_binding * nlmsvc_ops;
/* /*
* Functions exported by the lockd module * Functions exported by the lockd module
*/ */
extern void nlmsvc_invalidate_client(struct svc_client *clnt);
extern int nlmclnt_proc(struct inode *, int, struct file_lock *); extern int nlmclnt_proc(struct inode *, int, struct file_lock *);
extern int lockd_up(void); extern int lockd_up(void);
extern void lockd_down(void); extern void lockd_down(void);
......
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
struct nlm_host { struct nlm_host {
struct nlm_host * h_next; /* linked list (hash table) */ struct nlm_host * h_next; /* linked list (hash table) */
struct sockaddr_in h_addr; /* peer address */ struct sockaddr_in h_addr; /* peer address */
struct svc_client * h_exportent; /* NFS client */
struct rpc_clnt * h_rpcclnt; /* RPC client to talk to peer */ struct rpc_clnt * h_rpcclnt; /* RPC client to talk to peer */
char h_name[20]; /* remote hostname */ char h_name[20]; /* remote hostname */
u32 h_version; /* interface version */ u32 h_version; /* interface version */
unsigned short h_proto; /* transport proto */ unsigned short h_proto; /* transport proto */
unsigned short h_authflavor; /* RPC authentication type */ unsigned short h_authflavor; /* RPC authentication type */
unsigned short h_reclaiming : 1, unsigned short h_reclaiming : 1,
h_server : 1, /* server side, not client side */
h_inuse : 1, h_inuse : 1,
h_killed : 1, h_killed : 1,
h_monitored : 1; h_monitored : 1;
...@@ -143,8 +143,7 @@ void nlmclnt_freegrantargs(struct nlm_rqst *); ...@@ -143,8 +143,7 @@ void nlmclnt_freegrantargs(struct nlm_rqst *);
*/ */
struct nlm_host * nlmclnt_lookup_host(struct sockaddr_in *, int, int); struct nlm_host * nlmclnt_lookup_host(struct sockaddr_in *, int, int);
struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *); struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *);
struct nlm_host * nlm_lookup_host(struct svc_client *, struct nlm_host * nlm_lookup_host(int server, struct sockaddr_in *, int, int);
struct sockaddr_in *, int, int);
struct rpc_clnt * nlm_bind_host(struct nlm_host *); struct rpc_clnt * nlm_bind_host(struct nlm_host *);
void nlm_rebind_host(struct nlm_host *); void nlm_rebind_host(struct nlm_host *);
struct nlm_host * nlm_get_host(struct nlm_host *); struct nlm_host * nlm_get_host(struct nlm_host *);
......
...@@ -28,6 +28,7 @@ struct nsm_args { ...@@ -28,6 +28,7 @@ struct nsm_args {
u32 prog; /* RPC callback info */ u32 prog; /* RPC callback info */
u32 vers; u32 vers;
u32 proc; u32 proc;
u32 proto; /* protocol (udp/tcp) plus server/client flag */
}; };
/* /*
......
...@@ -76,6 +76,8 @@ struct nlm_reboot { ...@@ -76,6 +76,8 @@ struct nlm_reboot {
int len; int len;
u32 state; u32 state;
u32 addr; u32 addr;
u32 vers;
u32 proto;
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment