diff options
Diffstat (limited to 'fs/lockd/host.c')
-rw-r--r-- | fs/lockd/host.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index c7854791898f..a17664c7eacc 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c | |||
@@ -41,11 +41,12 @@ static struct nsm_handle * nsm_find(const struct sockaddr_in *sin, | |||
41 | /* | 41 | /* |
42 | * Common host lookup routine for server & client | 42 | * Common host lookup routine for server & client |
43 | */ | 43 | */ |
44 | static struct nlm_host * | 44 | static struct nlm_host *nlm_lookup_host(int server, |
45 | nlm_lookup_host(int server, const struct sockaddr_in *sin, | 45 | const struct sockaddr_in *sin, |
46 | int proto, int version, const char *hostname, | 46 | int proto, u32 version, |
47 | unsigned int hostname_len, | 47 | const char *hostname, |
48 | const struct sockaddr_in *ssin) | 48 | unsigned int hostname_len, |
49 | const struct sockaddr_in *ssin) | ||
49 | { | 50 | { |
50 | struct hlist_head *chain; | 51 | struct hlist_head *chain; |
51 | struct hlist_node *pos; | 52 | struct hlist_node *pos; |
@@ -54,7 +55,7 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin, | |||
54 | int hash; | 55 | int hash; |
55 | 56 | ||
56 | dprintk("lockd: nlm_lookup_host("NIPQUAD_FMT"->"NIPQUAD_FMT | 57 | dprintk("lockd: nlm_lookup_host("NIPQUAD_FMT"->"NIPQUAD_FMT |
57 | ", p=%d, v=%d, my role=%s, name=%.*s)\n", | 58 | ", p=%d, v=%u, my role=%s, name=%.*s)\n", |
58 | NIPQUAD(ssin->sin_addr.s_addr), | 59 | NIPQUAD(ssin->sin_addr.s_addr), |
59 | NIPQUAD(sin->sin_addr.s_addr), proto, version, | 60 | NIPQUAD(sin->sin_addr.s_addr), proto, version, |
60 | server? "server" : "client", | 61 | server? "server" : "client", |
@@ -172,9 +173,10 @@ nlm_destroy_host(struct nlm_host *host) | |||
172 | /* | 173 | /* |
173 | * Find an NLM server handle in the cache. If there is none, create it. | 174 | * Find an NLM server handle in the cache. If there is none, create it. |
174 | */ | 175 | */ |
175 | struct nlm_host * | 176 | struct nlm_host *nlmclnt_lookup_host(const struct sockaddr_in *sin, |
176 | nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version, | 177 | int proto, u32 version, |
177 | const char *hostname, unsigned int hostname_len) | 178 | const char *hostname, |
179 | unsigned int hostname_len) | ||
178 | { | 180 | { |
179 | struct sockaddr_in ssin = {0}; | 181 | struct sockaddr_in ssin = {0}; |
180 | 182 | ||