diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/lockd/lockd.h | 9 | ||||
| -rw-r--r-- | include/linux/lockd/xdr.h | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index e2d1ce36b367..4babb2a129ac 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -173,14 +173,17 @@ void nlmclnt_next_cookie(struct nlm_cookie *); | |||
| 173 | /* | 173 | /* |
| 174 | * Host cache | 174 | * Host cache |
| 175 | */ | 175 | */ |
| 176 | struct nlm_host * nlmclnt_lookup_host(const struct sockaddr_in *, int, int, const char *, int); | 176 | struct nlm_host *nlmclnt_lookup_host(const struct sockaddr_in *, int, int, |
| 177 | struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *, const char *, int); | 177 | const char *, unsigned int); |
| 178 | struct nlm_host *nlmsvc_lookup_host(struct svc_rqst *, const char *, | ||
| 179 | unsigned int); | ||
| 178 | struct rpc_clnt * nlm_bind_host(struct nlm_host *); | 180 | struct rpc_clnt * nlm_bind_host(struct nlm_host *); |
| 179 | void nlm_rebind_host(struct nlm_host *); | 181 | void nlm_rebind_host(struct nlm_host *); |
| 180 | struct nlm_host * nlm_get_host(struct nlm_host *); | 182 | struct nlm_host * nlm_get_host(struct nlm_host *); |
| 181 | void nlm_release_host(struct nlm_host *); | 183 | void nlm_release_host(struct nlm_host *); |
| 182 | void nlm_shutdown_hosts(void); | 184 | void nlm_shutdown_hosts(void); |
| 183 | extern void nlm_host_rebooted(const struct sockaddr_in *, const char *, int, u32); | 185 | extern void nlm_host_rebooted(const struct sockaddr_in *, const char *, |
| 186 | unsigned int, u32); | ||
| 184 | void nsm_release(struct nsm_handle *); | 187 | void nsm_release(struct nsm_handle *); |
| 185 | 188 | ||
| 186 | 189 | ||
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h index 83a1f9f6237b..df18fa053bcd 100644 --- a/include/linux/lockd/xdr.h +++ b/include/linux/lockd/xdr.h | |||
| @@ -29,7 +29,7 @@ struct svc_rqst; | |||
| 29 | /* Lock info passed via NLM */ | 29 | /* Lock info passed via NLM */ |
| 30 | struct nlm_lock { | 30 | struct nlm_lock { |
| 31 | char * caller; | 31 | char * caller; |
| 32 | int len; /* length of "caller" */ | 32 | unsigned int len; /* length of "caller" */ |
| 33 | struct nfs_fh fh; | 33 | struct nfs_fh fh; |
| 34 | struct xdr_netobj oh; | 34 | struct xdr_netobj oh; |
| 35 | u32 svid; | 35 | u32 svid; |
| @@ -78,7 +78,7 @@ struct nlm_res { | |||
| 78 | */ | 78 | */ |
| 79 | struct nlm_reboot { | 79 | struct nlm_reboot { |
| 80 | char * mon; | 80 | char * mon; |
| 81 | int len; | 81 | unsigned int len; |
| 82 | u32 state; | 82 | u32 state; |
| 83 | __be32 addr; | 83 | __be32 addr; |
| 84 | __be32 vers; | 84 | __be32 vers; |
