diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-13 03:35:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:52 -0500 |
| commit | e8c5c045d790e7018c56f1a998a2d240b732ea3c (patch) | |
| tree | d64de6d21d715d163244a1caeedd617955eaad5e /include/linux | |
| parent | 905f3ed62515f233fea09dc5ad68bbcff4903520 (diff) | |
[PATCH] lockd endianness annotations
Annotated, all places switched to keeping status net-endian.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/lockd/bind.h | 2 | ||||
| -rw-r--r-- | include/linux/lockd/lockd.h | 2 | ||||
| -rw-r--r-- | include/linux/lockd/sm_inter.h | 2 | ||||
| -rw-r--r-- | include/linux/lockd/xdr.h | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h index aa50d89eacd7..246de1d84a26 100644 --- a/include/linux/lockd/bind.h +++ b/include/linux/lockd/bind.h | |||
| @@ -23,7 +23,7 @@ struct svc_rqst; | |||
| 23 | * This is the set of functions for lockd->nfsd communication | 23 | * This is the set of functions for lockd->nfsd communication |
| 24 | */ | 24 | */ |
| 25 | struct nlmsvc_binding { | 25 | struct nlmsvc_binding { |
| 26 | u32 (*fopen)(struct svc_rqst *, | 26 | __be32 (*fopen)(struct svc_rqst *, |
| 27 | struct nfs_fh *, | 27 | struct nfs_fh *, |
| 28 | struct file **); | 28 | struct file **); |
| 29 | void (*fclose)(struct file *); | 29 | void (*fclose)(struct file *); |
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 0c962b82a9de..ac25b5649c59 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -191,7 +191,7 @@ __be32 nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *); | |||
| 191 | unsigned long nlmsvc_retry_blocked(void); | 191 | unsigned long nlmsvc_retry_blocked(void); |
| 192 | void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *, | 192 | void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *, |
| 193 | nlm_host_match_fn_t match); | 193 | nlm_host_match_fn_t match); |
| 194 | void nlmsvc_grant_reply(struct nlm_cookie *, u32); | 194 | void nlmsvc_grant_reply(struct nlm_cookie *, __be32); |
| 195 | 195 | ||
| 196 | /* | 196 | /* |
| 197 | * File handling for the server personality | 197 | * File handling for the server personality |
diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h index fc61d40964da..22a645828f26 100644 --- a/include/linux/lockd/sm_inter.h +++ b/include/linux/lockd/sm_inter.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * Arguments for all calls to statd | 24 | * Arguments for all calls to statd |
| 25 | */ | 25 | */ |
| 26 | struct nsm_args { | 26 | struct nsm_args { |
| 27 | u32 addr; /* remote address */ | 27 | __be32 addr; /* remote address */ |
| 28 | u32 prog; /* RPC callback info */ | 28 | u32 prog; /* RPC callback info */ |
| 29 | u32 vers; | 29 | u32 vers; |
| 30 | u32 proc; | 30 | u32 proc; |
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h index 29e7d9fc9dad..83a1f9f6237b 100644 --- a/include/linux/lockd/xdr.h +++ b/include/linux/lockd/xdr.h | |||
| @@ -69,7 +69,7 @@ typedef struct nlm_args nlm_args; | |||
| 69 | */ | 69 | */ |
| 70 | struct nlm_res { | 70 | struct nlm_res { |
| 71 | struct nlm_cookie cookie; | 71 | struct nlm_cookie cookie; |
| 72 | u32 status; | 72 | __be32 status; |
| 73 | struct nlm_lock lock; | 73 | struct nlm_lock lock; |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| @@ -80,9 +80,9 @@ struct nlm_reboot { | |||
| 80 | char * mon; | 80 | char * mon; |
| 81 | int len; | 81 | int len; |
| 82 | u32 state; | 82 | u32 state; |
| 83 | u32 addr; | 83 | __be32 addr; |
| 84 | u32 vers; | 84 | __be32 vers; |
| 85 | u32 proto; | 85 | __be32 proto; |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | /* | 88 | /* |
