mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
This commit is contained in:
commit
21b4e73692
1227 changed files with 24505 additions and 14149 deletions
|
|
@ -13,6 +13,7 @@
|
|||
#include <linux/nfs_fs.h>
|
||||
#include <linux/utsname.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/freezer.h>
|
||||
#include <linux/sunrpc/clnt.h>
|
||||
#include <linux/sunrpc/svc.h>
|
||||
#include <linux/lockd/lockd.h>
|
||||
|
|
|
|||
|
|
@ -36,34 +36,14 @@ static DEFINE_MUTEX(nlm_host_mutex);
|
|||
static void nlm_gc_hosts(void);
|
||||
static struct nsm_handle * __nsm_find(const struct sockaddr_in *,
|
||||
const char *, int, int);
|
||||
|
||||
/*
|
||||
* Find an NLM server handle in the cache. If there is none, create it.
|
||||
*/
|
||||
struct nlm_host *
|
||||
nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,
|
||||
const char *hostname, int hostname_len)
|
||||
{
|
||||
return nlm_lookup_host(0, sin, proto, version,
|
||||
hostname, hostname_len);
|
||||
}
|
||||
|
||||
/*
|
||||
* Find an NLM client handle in the cache. If there is none, create it.
|
||||
*/
|
||||
struct nlm_host *
|
||||
nlmsvc_lookup_host(struct svc_rqst *rqstp,
|
||||
const char *hostname, int hostname_len)
|
||||
{
|
||||
return nlm_lookup_host(1, &rqstp->rq_addr,
|
||||
rqstp->rq_prot, rqstp->rq_vers,
|
||||
hostname, hostname_len);
|
||||
}
|
||||
static struct nsm_handle * nsm_find(const struct sockaddr_in *sin,
|
||||
const char *hostname,
|
||||
int hostname_len);
|
||||
|
||||
/*
|
||||
* Common host lookup routine for server & client
|
||||
*/
|
||||
struct nlm_host *
|
||||
static struct nlm_host *
|
||||
nlm_lookup_host(int server, const struct sockaddr_in *sin,
|
||||
int proto, int version,
|
||||
const char *hostname,
|
||||
|
|
@ -194,6 +174,29 @@ nlm_destroy_host(struct nlm_host *host)
|
|||
kfree(host);
|
||||
}
|
||||
|
||||
/*
|
||||
* Find an NLM server handle in the cache. If there is none, create it.
|
||||
*/
|
||||
struct nlm_host *
|
||||
nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,
|
||||
const char *hostname, int hostname_len)
|
||||
{
|
||||
return nlm_lookup_host(0, sin, proto, version,
|
||||
hostname, hostname_len);
|
||||
}
|
||||
|
||||
/*
|
||||
* Find an NLM client handle in the cache. If there is none, create it.
|
||||
*/
|
||||
struct nlm_host *
|
||||
nlmsvc_lookup_host(struct svc_rqst *rqstp,
|
||||
const char *hostname, int hostname_len)
|
||||
{
|
||||
return nlm_lookup_host(1, &rqstp->rq_addr,
|
||||
rqstp->rq_prot, rqstp->rq_vers,
|
||||
hostname, hostname_len);
|
||||
}
|
||||
|
||||
/*
|
||||
* Create the NLM RPC client for an NLM peer
|
||||
*/
|
||||
|
|
@ -495,7 +498,7 @@ out:
|
|||
return nsm;
|
||||
}
|
||||
|
||||
struct nsm_handle *
|
||||
static struct nsm_handle *
|
||||
nsm_find(const struct sockaddr_in *sin, const char *hostname, int hostname_len)
|
||||
{
|
||||
return __nsm_find(sin, hostname, hostname_len, 1);
|
||||
|
|
|
|||
Loading…
Reference in a new issue