diff options
author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/linux/nfsd | |
parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
parent | e1036502e5263851259d147771226161e5ccc85a (diff) |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/linux/nfsd')
-rw-r--r-- | include/linux/nfsd/cache.h | 6 | ||||
-rw-r--r-- | include/linux/nfsd/export.h | 4 | ||||
-rw-r--r-- | include/linux/nfsd/nfsd.h | 45 | ||||
-rw-r--r-- | include/linux/nfsd/nfsfh.h | 8 | ||||
-rw-r--r-- | include/linux/nfsd/state.h | 12 | ||||
-rw-r--r-- | include/linux/nfsd/xdr.h | 50 | ||||
-rw-r--r-- | include/linux/nfsd/xdr3.h | 114 | ||||
-rw-r--r-- | include/linux/nfsd/xdr4.h | 54 |
8 files changed, 147 insertions, 146 deletions
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h index c3a3557c2a5b..007480cd6a60 100644 --- a/include/linux/nfsd/cache.h +++ b/include/linux/nfsd/cache.h | |||
@@ -26,14 +26,14 @@ struct svc_cacherep { | |||
26 | c_type, /* status, buffer */ | 26 | c_type, /* status, buffer */ |
27 | c_secure : 1; /* req came from port < 1024 */ | 27 | c_secure : 1; /* req came from port < 1024 */ |
28 | struct sockaddr_in c_addr; | 28 | struct sockaddr_in c_addr; |
29 | u32 c_xid; | 29 | __be32 c_xid; |
30 | u32 c_prot; | 30 | u32 c_prot; |
31 | u32 c_proc; | 31 | u32 c_proc; |
32 | u32 c_vers; | 32 | u32 c_vers; |
33 | unsigned long c_timestamp; | 33 | unsigned long c_timestamp; |
34 | union { | 34 | union { |
35 | struct kvec u_vec; | 35 | struct kvec u_vec; |
36 | u32 u_status; | 36 | __be32 u_status; |
37 | } c_u; | 37 | } c_u; |
38 | }; | 38 | }; |
39 | 39 | ||
@@ -75,7 +75,7 @@ enum { | |||
75 | void nfsd_cache_init(void); | 75 | void nfsd_cache_init(void); |
76 | void nfsd_cache_shutdown(void); | 76 | void nfsd_cache_shutdown(void); |
77 | int nfsd_cache_lookup(struct svc_rqst *, int); | 77 | int nfsd_cache_lookup(struct svc_rqst *, int); |
78 | void nfsd_cache_update(struct svc_rqst *, int, u32 *); | 78 | void nfsd_cache_update(struct svc_rqst *, int, __be32 *); |
79 | 79 | ||
80 | #endif /* __KERNEL__ */ | 80 | #endif /* __KERNEL__ */ |
81 | #endif /* NFSCACHE_H */ | 81 | #endif /* NFSCACHE_H */ |
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index 6e78ea969f49..045e38cdbe64 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h | |||
@@ -117,8 +117,8 @@ struct svc_export * exp_parent(struct auth_domain *clp, | |||
117 | struct cache_req *reqp); | 117 | struct cache_req *reqp); |
118 | int exp_rootfh(struct auth_domain *, | 118 | int exp_rootfh(struct auth_domain *, |
119 | char *path, struct knfsd_fh *, int maxsize); | 119 | char *path, struct knfsd_fh *, int maxsize); |
120 | int exp_pseudoroot(struct auth_domain *, struct svc_fh *fhp, struct cache_req *creq); | 120 | __be32 exp_pseudoroot(struct auth_domain *, struct svc_fh *fhp, struct cache_req *creq); |
121 | int nfserrno(int errno); | 121 | __be32 nfserrno(int errno); |
122 | 122 | ||
123 | extern struct cache_detail svc_export_cache; | 123 | extern struct cache_detail svc_export_cache; |
124 | 124 | ||
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index d0d4aae7085f..edb54c3171b3 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
@@ -50,7 +50,7 @@ | |||
50 | * Callback function for readdir | 50 | * Callback function for readdir |
51 | */ | 51 | */ |
52 | struct readdir_cd { | 52 | struct readdir_cd { |
53 | int err; /* 0, nfserr, or nfserr_eof */ | 53 | __be32 err; /* 0, nfserr, or nfserr_eof */ |
54 | }; | 54 | }; |
55 | typedef int (*encode_dent_fn)(struct readdir_cd *, const char *, | 55 | typedef int (*encode_dent_fn)(struct readdir_cd *, const char *, |
56 | int, loff_t, ino_t, unsigned int); | 56 | int, loff_t, ino_t, unsigned int); |
@@ -64,7 +64,7 @@ extern struct svc_serv *nfsd_serv; | |||
64 | * Function prototypes. | 64 | * Function prototypes. |
65 | */ | 65 | */ |
66 | int nfsd_svc(unsigned short port, int nrservs); | 66 | int nfsd_svc(unsigned short port, int nrservs); |
67 | int nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp); | 67 | int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp); |
68 | 68 | ||
69 | /* nfsd/vfs.c */ | 69 | /* nfsd/vfs.c */ |
70 | int fh_lock_parent(struct svc_fh *, struct dentry *); | 70 | int fh_lock_parent(struct svc_fh *, struct dentry *); |
@@ -72,57 +72,57 @@ int nfsd_racache_init(int); | |||
72 | void nfsd_racache_shutdown(void); | 72 | void nfsd_racache_shutdown(void); |
73 | int nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, | 73 | int nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, |
74 | struct svc_export **expp); | 74 | struct svc_export **expp); |
75 | int nfsd_lookup(struct svc_rqst *, struct svc_fh *, | 75 | __be32 nfsd_lookup(struct svc_rqst *, struct svc_fh *, |
76 | const char *, int, struct svc_fh *); | 76 | const char *, int, struct svc_fh *); |
77 | int nfsd_setattr(struct svc_rqst *, struct svc_fh *, | 77 | __be32 nfsd_setattr(struct svc_rqst *, struct svc_fh *, |
78 | struct iattr *, int, time_t); | 78 | struct iattr *, int, time_t); |
79 | #ifdef CONFIG_NFSD_V4 | 79 | #ifdef CONFIG_NFSD_V4 |
80 | int nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *, | 80 | __be32 nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *, |
81 | struct nfs4_acl *); | 81 | struct nfs4_acl *); |
82 | int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **); | 82 | int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **); |
83 | #endif /* CONFIG_NFSD_V4 */ | 83 | #endif /* CONFIG_NFSD_V4 */ |
84 | int nfsd_create(struct svc_rqst *, struct svc_fh *, | 84 | __be32 nfsd_create(struct svc_rqst *, struct svc_fh *, |
85 | char *name, int len, struct iattr *attrs, | 85 | char *name, int len, struct iattr *attrs, |
86 | int type, dev_t rdev, struct svc_fh *res); | 86 | int type, dev_t rdev, struct svc_fh *res); |
87 | #ifdef CONFIG_NFSD_V3 | 87 | #ifdef CONFIG_NFSD_V3 |
88 | int nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *); | 88 | __be32 nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *); |
89 | int nfsd_create_v3(struct svc_rqst *, struct svc_fh *, | 89 | __be32 nfsd_create_v3(struct svc_rqst *, struct svc_fh *, |
90 | char *name, int len, struct iattr *attrs, | 90 | char *name, int len, struct iattr *attrs, |
91 | struct svc_fh *res, int createmode, | 91 | struct svc_fh *res, int createmode, |
92 | u32 *verifier, int *truncp); | 92 | u32 *verifier, int *truncp, int *created); |
93 | int nfsd_commit(struct svc_rqst *, struct svc_fh *, | 93 | __be32 nfsd_commit(struct svc_rqst *, struct svc_fh *, |
94 | loff_t, unsigned long); | 94 | loff_t, unsigned long); |
95 | #endif /* CONFIG_NFSD_V3 */ | 95 | #endif /* CONFIG_NFSD_V3 */ |
96 | int nfsd_open(struct svc_rqst *, struct svc_fh *, int, | 96 | __be32 nfsd_open(struct svc_rqst *, struct svc_fh *, int, |
97 | int, struct file **); | 97 | int, struct file **); |
98 | void nfsd_close(struct file *); | 98 | void nfsd_close(struct file *); |
99 | int nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *, | 99 | __be32 nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *, |
100 | loff_t, struct kvec *, int, unsigned long *); | 100 | loff_t, struct kvec *, int, unsigned long *); |
101 | int nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *, | 101 | __be32 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *, |
102 | loff_t, struct kvec *,int, unsigned long, int *); | 102 | loff_t, struct kvec *,int, unsigned long, int *); |
103 | int nfsd_readlink(struct svc_rqst *, struct svc_fh *, | 103 | __be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *, |
104 | char *, int *); | 104 | char *, int *); |
105 | int nfsd_symlink(struct svc_rqst *, struct svc_fh *, | 105 | __be32 nfsd_symlink(struct svc_rqst *, struct svc_fh *, |
106 | char *name, int len, char *path, int plen, | 106 | char *name, int len, char *path, int plen, |
107 | struct svc_fh *res, struct iattr *); | 107 | struct svc_fh *res, struct iattr *); |
108 | int nfsd_link(struct svc_rqst *, struct svc_fh *, | 108 | __be32 nfsd_link(struct svc_rqst *, struct svc_fh *, |
109 | char *, int, struct svc_fh *); | 109 | char *, int, struct svc_fh *); |
110 | int nfsd_rename(struct svc_rqst *, | 110 | __be32 nfsd_rename(struct svc_rqst *, |
111 | struct svc_fh *, char *, int, | 111 | struct svc_fh *, char *, int, |
112 | struct svc_fh *, char *, int); | 112 | struct svc_fh *, char *, int); |
113 | int nfsd_remove(struct svc_rqst *, | 113 | __be32 nfsd_remove(struct svc_rqst *, |
114 | struct svc_fh *, char *, int); | 114 | struct svc_fh *, char *, int); |
115 | int nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type, | 115 | __be32 nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type, |
116 | char *name, int len); | 116 | char *name, int len); |
117 | int nfsd_truncate(struct svc_rqst *, struct svc_fh *, | 117 | int nfsd_truncate(struct svc_rqst *, struct svc_fh *, |
118 | unsigned long size); | 118 | unsigned long size); |
119 | int nfsd_readdir(struct svc_rqst *, struct svc_fh *, | 119 | __be32 nfsd_readdir(struct svc_rqst *, struct svc_fh *, |
120 | loff_t *, struct readdir_cd *, encode_dent_fn); | 120 | loff_t *, struct readdir_cd *, encode_dent_fn); |
121 | int nfsd_statfs(struct svc_rqst *, struct svc_fh *, | 121 | __be32 nfsd_statfs(struct svc_rqst *, struct svc_fh *, |
122 | struct kstatfs *); | 122 | struct kstatfs *); |
123 | 123 | ||
124 | int nfsd_notify_change(struct inode *, struct iattr *); | 124 | int nfsd_notify_change(struct inode *, struct iattr *); |
125 | int nfsd_permission(struct svc_export *, struct dentry *, int); | 125 | __be32 nfsd_permission(struct svc_export *, struct dentry *, int); |
126 | int nfsd_sync_dir(struct dentry *dp); | 126 | int nfsd_sync_dir(struct dentry *dp); |
127 | 127 | ||
128 | #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) | 128 | #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) |
@@ -238,6 +238,7 @@ void nfsd_lockd_shutdown(void); | |||
238 | #define nfserr_badname __constant_htonl(NFSERR_BADNAME) | 238 | #define nfserr_badname __constant_htonl(NFSERR_BADNAME) |
239 | #define nfserr_cb_path_down __constant_htonl(NFSERR_CB_PATH_DOWN) | 239 | #define nfserr_cb_path_down __constant_htonl(NFSERR_CB_PATH_DOWN) |
240 | #define nfserr_locked __constant_htonl(NFSERR_LOCKED) | 240 | #define nfserr_locked __constant_htonl(NFSERR_LOCKED) |
241 | #define nfserr_replay_me __constant_htonl(NFSERR_REPLAY_ME) | ||
241 | 242 | ||
242 | /* error codes for internal use */ | 243 | /* error codes for internal use */ |
243 | /* if a request fails due to kmalloc failure, it gets dropped. | 244 | /* if a request fails due to kmalloc failure, it gets dropped. |
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index 069257ea99a0..f3b51d62ec7d 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
@@ -157,7 +157,7 @@ typedef struct svc_fh { | |||
157 | __u64 fh_post_size; /* i_size */ | 157 | __u64 fh_post_size; /* i_size */ |
158 | unsigned long fh_post_blocks; /* i_blocks */ | 158 | unsigned long fh_post_blocks; /* i_blocks */ |
159 | unsigned long fh_post_blksize;/* i_blksize */ | 159 | unsigned long fh_post_blksize;/* i_blksize */ |
160 | __u32 fh_post_rdev[2];/* i_rdev */ | 160 | __be32 fh_post_rdev[2];/* i_rdev */ |
161 | struct timespec fh_post_atime; /* i_atime */ | 161 | struct timespec fh_post_atime; /* i_atime */ |
162 | struct timespec fh_post_mtime; /* i_mtime */ | 162 | struct timespec fh_post_mtime; /* i_mtime */ |
163 | struct timespec fh_post_ctime; /* i_ctime */ | 163 | struct timespec fh_post_ctime; /* i_ctime */ |
@@ -209,9 +209,9 @@ extern char * SVCFH_fmt(struct svc_fh *fhp); | |||
209 | /* | 209 | /* |
210 | * Function prototypes | 210 | * Function prototypes |
211 | */ | 211 | */ |
212 | u32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int); | 212 | __be32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int); |
213 | int fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *); | 213 | __be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *); |
214 | int fh_update(struct svc_fh *); | 214 | __be32 fh_update(struct svc_fh *); |
215 | void fh_put(struct svc_fh *); | 215 | void fh_put(struct svc_fh *); |
216 | 216 | ||
217 | static __inline__ struct svc_fh * | 217 | static __inline__ struct svc_fh * |
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h index 8bf23cf8b603..c3673f487e84 100644 --- a/include/linux/nfsd/state.h +++ b/include/linux/nfsd/state.h | |||
@@ -125,7 +125,7 @@ struct nfs4_client { | |||
125 | char cl_recdir[HEXDIR_LEN]; /* recovery dir */ | 125 | char cl_recdir[HEXDIR_LEN]; /* recovery dir */ |
126 | nfs4_verifier cl_verifier; /* generated by client */ | 126 | nfs4_verifier cl_verifier; /* generated by client */ |
127 | time_t cl_time; /* time of last lease renewal */ | 127 | time_t cl_time; /* time of last lease renewal */ |
128 | u32 cl_addr; /* client ipaddress */ | 128 | __be32 cl_addr; /* client ipaddress */ |
129 | struct svc_cred cl_cred; /* setclientid principal */ | 129 | struct svc_cred cl_cred; /* setclientid principal */ |
130 | clientid_t cl_clientid; /* generated by server */ | 130 | clientid_t cl_clientid; /* generated by server */ |
131 | nfs4_verifier cl_confirm; /* generated by server */ | 131 | nfs4_verifier cl_confirm; /* generated by server */ |
@@ -164,7 +164,7 @@ update_stateid(stateid_t *stateid) | |||
164 | * is cached. | 164 | * is cached. |
165 | */ | 165 | */ |
166 | struct nfs4_replay { | 166 | struct nfs4_replay { |
167 | u32 rp_status; | 167 | __be32 rp_status; |
168 | unsigned int rp_buflen; | 168 | unsigned int rp_buflen; |
169 | char *rp_buf; | 169 | char *rp_buf; |
170 | unsigned intrp_allocated; | 170 | unsigned intrp_allocated; |
@@ -273,19 +273,19 @@ struct nfs4_stateid { | |||
273 | ((err) != nfserr_stale_stateid) && \ | 273 | ((err) != nfserr_stale_stateid) && \ |
274 | ((err) != nfserr_bad_stateid)) | 274 | ((err) != nfserr_bad_stateid)) |
275 | 275 | ||
276 | extern int nfsd4_renew(clientid_t *clid); | 276 | extern __be32 nfsd4_renew(clientid_t *clid); |
277 | extern int nfs4_preprocess_stateid_op(struct svc_fh *current_fh, | 277 | extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh, |
278 | stateid_t *stateid, int flags, struct file **filp); | 278 | stateid_t *stateid, int flags, struct file **filp); |
279 | extern void nfs4_lock_state(void); | 279 | extern void nfs4_lock_state(void); |
280 | extern void nfs4_unlock_state(void); | 280 | extern void nfs4_unlock_state(void); |
281 | extern int nfs4_in_grace(void); | 281 | extern int nfs4_in_grace(void); |
282 | extern int nfs4_check_open_reclaim(clientid_t *clid); | 282 | extern __be32 nfs4_check_open_reclaim(clientid_t *clid); |
283 | extern void put_nfs4_client(struct nfs4_client *clp); | 283 | extern void put_nfs4_client(struct nfs4_client *clp); |
284 | extern void nfs4_free_stateowner(struct kref *kref); | 284 | extern void nfs4_free_stateowner(struct kref *kref); |
285 | extern void nfsd4_probe_callback(struct nfs4_client *clp); | 285 | extern void nfsd4_probe_callback(struct nfs4_client *clp); |
286 | extern void nfsd4_cb_recall(struct nfs4_delegation *dp); | 286 | extern void nfsd4_cb_recall(struct nfs4_delegation *dp); |
287 | extern void nfs4_put_delegation(struct nfs4_delegation *dp); | 287 | extern void nfs4_put_delegation(struct nfs4_delegation *dp); |
288 | extern int nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname); | 288 | extern __be32 nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname); |
289 | extern void nfsd4_init_recdir(char *recdir_name); | 289 | extern void nfsd4_init_recdir(char *recdir_name); |
290 | extern int nfsd4_recdir_load(void); | 290 | extern int nfsd4_recdir_load(void); |
291 | extern void nfsd4_shutdown_recdir(void); | 291 | extern void nfsd4_shutdown_recdir(void); |
diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h index 0e53de87d886..877192d3ae79 100644 --- a/include/linux/nfsd/xdr.h +++ b/include/linux/nfsd/xdr.h | |||
@@ -81,7 +81,7 @@ struct nfsd_readdirargs { | |||
81 | struct svc_fh fh; | 81 | struct svc_fh fh; |
82 | __u32 cookie; | 82 | __u32 cookie; |
83 | __u32 count; | 83 | __u32 count; |
84 | u32 * buffer; | 84 | __be32 * buffer; |
85 | }; | 85 | }; |
86 | 86 | ||
87 | struct nfsd_attrstat { | 87 | struct nfsd_attrstat { |
@@ -108,9 +108,9 @@ struct nfsd_readdirres { | |||
108 | int count; | 108 | int count; |
109 | 109 | ||
110 | struct readdir_cd common; | 110 | struct readdir_cd common; |
111 | u32 * buffer; | 111 | __be32 * buffer; |
112 | int buflen; | 112 | int buflen; |
113 | u32 * offset; | 113 | __be32 * offset; |
114 | }; | 114 | }; |
115 | 115 | ||
116 | struct nfsd_statfsres { | 116 | struct nfsd_statfsres { |
@@ -135,43 +135,43 @@ union nfsd_xdrstore { | |||
135 | #define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) | 135 | #define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) |
136 | 136 | ||
137 | 137 | ||
138 | int nfssvc_decode_void(struct svc_rqst *, u32 *, void *); | 138 | int nfssvc_decode_void(struct svc_rqst *, __be32 *, void *); |
139 | int nfssvc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); | 139 | int nfssvc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *); |
140 | int nfssvc_decode_sattrargs(struct svc_rqst *, u32 *, | 140 | int nfssvc_decode_sattrargs(struct svc_rqst *, __be32 *, |
141 | struct nfsd_sattrargs *); | 141 | struct nfsd_sattrargs *); |
142 | int nfssvc_decode_diropargs(struct svc_rqst *, u32 *, | 142 | int nfssvc_decode_diropargs(struct svc_rqst *, __be32 *, |
143 | struct nfsd_diropargs *); | 143 | struct nfsd_diropargs *); |
144 | int nfssvc_decode_readargs(struct svc_rqst *, u32 *, | 144 | int nfssvc_decode_readargs(struct svc_rqst *, __be32 *, |
145 | struct nfsd_readargs *); | 145 | struct nfsd_readargs *); |
146 | int nfssvc_decode_writeargs(struct svc_rqst *, u32 *, | 146 | int nfssvc_decode_writeargs(struct svc_rqst *, __be32 *, |
147 | struct nfsd_writeargs *); | 147 | struct nfsd_writeargs *); |
148 | int nfssvc_decode_createargs(struct svc_rqst *, u32 *, | 148 | int nfssvc_decode_createargs(struct svc_rqst *, __be32 *, |
149 | struct nfsd_createargs *); | 149 | struct nfsd_createargs *); |
150 | int nfssvc_decode_renameargs(struct svc_rqst *, u32 *, | 150 | int nfssvc_decode_renameargs(struct svc_rqst *, __be32 *, |
151 | struct nfsd_renameargs *); | 151 | struct nfsd_renameargs *); |
152 | int nfssvc_decode_readlinkargs(struct svc_rqst *, u32 *, | 152 | int nfssvc_decode_readlinkargs(struct svc_rqst *, __be32 *, |
153 | struct nfsd_readlinkargs *); | 153 | struct nfsd_readlinkargs *); |
154 | int nfssvc_decode_linkargs(struct svc_rqst *, u32 *, | 154 | int nfssvc_decode_linkargs(struct svc_rqst *, __be32 *, |
155 | struct nfsd_linkargs *); | 155 | struct nfsd_linkargs *); |
156 | int nfssvc_decode_symlinkargs(struct svc_rqst *, u32 *, | 156 | int nfssvc_decode_symlinkargs(struct svc_rqst *, __be32 *, |
157 | struct nfsd_symlinkargs *); | 157 | struct nfsd_symlinkargs *); |
158 | int nfssvc_decode_readdirargs(struct svc_rqst *, u32 *, | 158 | int nfssvc_decode_readdirargs(struct svc_rqst *, __be32 *, |
159 | struct nfsd_readdirargs *); | 159 | struct nfsd_readdirargs *); |
160 | int nfssvc_encode_void(struct svc_rqst *, u32 *, void *); | 160 | int nfssvc_encode_void(struct svc_rqst *, __be32 *, void *); |
161 | int nfssvc_encode_attrstat(struct svc_rqst *, u32 *, struct nfsd_attrstat *); | 161 | int nfssvc_encode_attrstat(struct svc_rqst *, __be32 *, struct nfsd_attrstat *); |
162 | int nfssvc_encode_diropres(struct svc_rqst *, u32 *, struct nfsd_diropres *); | 162 | int nfssvc_encode_diropres(struct svc_rqst *, __be32 *, struct nfsd_diropres *); |
163 | int nfssvc_encode_readlinkres(struct svc_rqst *, u32 *, struct nfsd_readlinkres *); | 163 | int nfssvc_encode_readlinkres(struct svc_rqst *, __be32 *, struct nfsd_readlinkres *); |
164 | int nfssvc_encode_readres(struct svc_rqst *, u32 *, struct nfsd_readres *); | 164 | int nfssvc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd_readres *); |
165 | int nfssvc_encode_statfsres(struct svc_rqst *, u32 *, struct nfsd_statfsres *); | 165 | int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *, struct nfsd_statfsres *); |
166 | int nfssvc_encode_readdirres(struct svc_rqst *, u32 *, struct nfsd_readdirres *); | 166 | int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *, struct nfsd_readdirres *); |
167 | 167 | ||
168 | int nfssvc_encode_entry(struct readdir_cd *, const char *name, | 168 | int nfssvc_encode_entry(struct readdir_cd *, const char *name, |
169 | int namlen, loff_t offset, ino_t ino, unsigned int); | 169 | int namlen, loff_t offset, ino_t ino, unsigned int); |
170 | 170 | ||
171 | int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); | 171 | int nfssvc_release_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *); |
172 | 172 | ||
173 | /* Helper functions for NFSv2 ACL code */ | 173 | /* Helper functions for NFSv2 ACL code */ |
174 | u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp); | 174 | __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp); |
175 | u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp); | 175 | __be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp); |
176 | 176 | ||
177 | #endif /* LINUX_NFSD_H */ | 177 | #endif /* LINUX_NFSD_H */ |
diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h index 474d882dc2f3..79963867b0d7 100644 --- a/include/linux/nfsd/xdr3.h +++ b/include/linux/nfsd/xdr3.h | |||
@@ -51,7 +51,7 @@ struct nfsd3_createargs { | |||
51 | int len; | 51 | int len; |
52 | int createmode; | 52 | int createmode; |
53 | struct iattr attrs; | 53 | struct iattr attrs; |
54 | __u32 * verf; | 54 | __be32 * verf; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | struct nfsd3_mknodargs { | 57 | struct nfsd3_mknodargs { |
@@ -98,8 +98,8 @@ struct nfsd3_readdirargs { | |||
98 | __u64 cookie; | 98 | __u64 cookie; |
99 | __u32 dircount; | 99 | __u32 dircount; |
100 | __u32 count; | 100 | __u32 count; |
101 | __u32 * verf; | 101 | __be32 * verf; |
102 | u32 * buffer; | 102 | __be32 * buffer; |
103 | }; | 103 | }; |
104 | 104 | ||
105 | struct nfsd3_commitargs { | 105 | struct nfsd3_commitargs { |
@@ -122,79 +122,79 @@ struct nfsd3_setaclargs { | |||
122 | }; | 122 | }; |
123 | 123 | ||
124 | struct nfsd3_attrstat { | 124 | struct nfsd3_attrstat { |
125 | __u32 status; | 125 | __be32 status; |
126 | struct svc_fh fh; | 126 | struct svc_fh fh; |
127 | struct kstat stat; | 127 | struct kstat stat; |
128 | }; | 128 | }; |
129 | 129 | ||
130 | /* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */ | 130 | /* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */ |
131 | struct nfsd3_diropres { | 131 | struct nfsd3_diropres { |
132 | __u32 status; | 132 | __be32 status; |
133 | struct svc_fh dirfh; | 133 | struct svc_fh dirfh; |
134 | struct svc_fh fh; | 134 | struct svc_fh fh; |
135 | }; | 135 | }; |
136 | 136 | ||
137 | struct nfsd3_accessres { | 137 | struct nfsd3_accessres { |
138 | __u32 status; | 138 | __be32 status; |
139 | struct svc_fh fh; | 139 | struct svc_fh fh; |
140 | __u32 access; | 140 | __u32 access; |
141 | }; | 141 | }; |
142 | 142 | ||
143 | struct nfsd3_readlinkres { | 143 | struct nfsd3_readlinkres { |
144 | __u32 status; | 144 | __be32 status; |
145 | struct svc_fh fh; | 145 | struct svc_fh fh; |
146 | __u32 len; | 146 | __u32 len; |
147 | }; | 147 | }; |
148 | 148 | ||
149 | struct nfsd3_readres { | 149 | struct nfsd3_readres { |
150 | __u32 status; | 150 | __be32 status; |
151 | struct svc_fh fh; | 151 | struct svc_fh fh; |
152 | unsigned long count; | 152 | unsigned long count; |
153 | int eof; | 153 | int eof; |
154 | }; | 154 | }; |
155 | 155 | ||
156 | struct nfsd3_writeres { | 156 | struct nfsd3_writeres { |
157 | __u32 status; | 157 | __be32 status; |
158 | struct svc_fh fh; | 158 | struct svc_fh fh; |
159 | unsigned long count; | 159 | unsigned long count; |
160 | int committed; | 160 | int committed; |
161 | }; | 161 | }; |
162 | 162 | ||
163 | struct nfsd3_renameres { | 163 | struct nfsd3_renameres { |
164 | __u32 status; | 164 | __be32 status; |
165 | struct svc_fh ffh; | 165 | struct svc_fh ffh; |
166 | struct svc_fh tfh; | 166 | struct svc_fh tfh; |
167 | }; | 167 | }; |
168 | 168 | ||
169 | struct nfsd3_linkres { | 169 | struct nfsd3_linkres { |
170 | __u32 status; | 170 | __be32 status; |
171 | struct svc_fh tfh; | 171 | struct svc_fh tfh; |
172 | struct svc_fh fh; | 172 | struct svc_fh fh; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | struct nfsd3_readdirres { | 175 | struct nfsd3_readdirres { |
176 | __u32 status; | 176 | __be32 status; |
177 | struct svc_fh fh; | 177 | struct svc_fh fh; |
178 | int count; | 178 | int count; |
179 | __u32 verf[2]; | 179 | __be32 verf[2]; |
180 | 180 | ||
181 | struct readdir_cd common; | 181 | struct readdir_cd common; |
182 | u32 * buffer; | 182 | __be32 * buffer; |
183 | int buflen; | 183 | int buflen; |
184 | u32 * offset; | 184 | __be32 * offset; |
185 | u32 * offset1; | 185 | __be32 * offset1; |
186 | struct svc_rqst * rqstp; | 186 | struct svc_rqst * rqstp; |
187 | 187 | ||
188 | }; | 188 | }; |
189 | 189 | ||
190 | struct nfsd3_fsstatres { | 190 | struct nfsd3_fsstatres { |
191 | __u32 status; | 191 | __be32 status; |
192 | struct kstatfs stats; | 192 | struct kstatfs stats; |
193 | __u32 invarsec; | 193 | __u32 invarsec; |
194 | }; | 194 | }; |
195 | 195 | ||
196 | struct nfsd3_fsinfores { | 196 | struct nfsd3_fsinfores { |
197 | __u32 status; | 197 | __be32 status; |
198 | __u32 f_rtmax; | 198 | __u32 f_rtmax; |
199 | __u32 f_rtpref; | 199 | __u32 f_rtpref; |
200 | __u32 f_rtmult; | 200 | __u32 f_rtmult; |
@@ -207,7 +207,7 @@ struct nfsd3_fsinfores { | |||
207 | }; | 207 | }; |
208 | 208 | ||
209 | struct nfsd3_pathconfres { | 209 | struct nfsd3_pathconfres { |
210 | __u32 status; | 210 | __be32 status; |
211 | __u32 p_link_max; | 211 | __u32 p_link_max; |
212 | __u32 p_name_max; | 212 | __u32 p_name_max; |
213 | __u32 p_no_trunc; | 213 | __u32 p_no_trunc; |
@@ -217,12 +217,12 @@ struct nfsd3_pathconfres { | |||
217 | }; | 217 | }; |
218 | 218 | ||
219 | struct nfsd3_commitres { | 219 | struct nfsd3_commitres { |
220 | __u32 status; | 220 | __be32 status; |
221 | struct svc_fh fh; | 221 | struct svc_fh fh; |
222 | }; | 222 | }; |
223 | 223 | ||
224 | struct nfsd3_getaclres { | 224 | struct nfsd3_getaclres { |
225 | __u32 status; | 225 | __be32 status; |
226 | struct svc_fh fh; | 226 | struct svc_fh fh; |
227 | int mask; | 227 | int mask; |
228 | struct posix_acl *acl_access; | 228 | struct posix_acl *acl_access; |
@@ -266,70 +266,70 @@ union nfsd3_xdrstore { | |||
266 | 266 | ||
267 | #define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore) | 267 | #define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore) |
268 | 268 | ||
269 | int nfs3svc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); | 269 | int nfs3svc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *); |
270 | int nfs3svc_decode_sattrargs(struct svc_rqst *, u32 *, | 270 | int nfs3svc_decode_sattrargs(struct svc_rqst *, __be32 *, |
271 | struct nfsd3_sattrargs *); | 271 | struct nfsd3_sattrargs *); |
272 | int nfs3svc_decode_diropargs(struct svc_rqst *, u32 *, | 272 | int nfs3svc_decode_diropargs(struct svc_rqst *, __be32 *, |
273 | struct nfsd3_diropargs *); | 273 | struct nfsd3_diropargs *); |
274 | int nfs3svc_decode_accessargs(struct svc_rqst *, u32 *, | 274 | int nfs3svc_decode_accessargs(struct svc_rqst *, __be32 *, |
275 | struct nfsd3_accessargs *); | 275 | struct nfsd3_accessargs *); |
276 | int nfs3svc_decode_readargs(struct svc_rqst *, u32 *, | 276 | int nfs3svc_decode_readargs(struct svc_rqst *, __be32 *, |
277 | struct nfsd3_readargs *); | 277 | struct nfsd3_readargs *); |
278 | int nfs3svc_decode_writeargs(struct svc_rqst *, u32 *, | 278 | int nfs3svc_decode_writeargs(struct svc_rqst *, __be32 *, |
279 | struct nfsd3_writeargs *); | 279 | struct nfsd3_writeargs *); |
280 | int nfs3svc_decode_createargs(struct svc_rqst *, u32 *, | 280 | int nfs3svc_decode_createargs(struct svc_rqst *, __be32 *, |
281 | struct nfsd3_createargs *); | 281 | struct nfsd3_createargs *); |
282 | int nfs3svc_decode_mkdirargs(struct svc_rqst *, u32 *, | 282 | int nfs3svc_decode_mkdirargs(struct svc_rqst *, __be32 *, |
283 | struct nfsd3_createargs *); | 283 | struct nfsd3_createargs *); |
284 | int nfs3svc_decode_mknodargs(struct svc_rqst *, u32 *, | 284 | int nfs3svc_decode_mknodargs(struct svc_rqst *, __be32 *, |
285 | struct nfsd3_mknodargs *); | 285 | struct nfsd3_mknodargs *); |
286 | int nfs3svc_decode_renameargs(struct svc_rqst *, u32 *, | 286 | int nfs3svc_decode_renameargs(struct svc_rqst *, __be32 *, |
287 | struct nfsd3_renameargs *); | 287 | struct nfsd3_renameargs *); |
288 | int nfs3svc_decode_readlinkargs(struct svc_rqst *, u32 *, | 288 | int nfs3svc_decode_readlinkargs(struct svc_rqst *, __be32 *, |
289 | struct nfsd3_readlinkargs *); | 289 | struct nfsd3_readlinkargs *); |
290 | int nfs3svc_decode_linkargs(struct svc_rqst *, u32 *, | 290 | int nfs3svc_decode_linkargs(struct svc_rqst *, __be32 *, |
291 | struct nfsd3_linkargs *); | 291 | struct nfsd3_linkargs *); |
292 | int nfs3svc_decode_symlinkargs(struct svc_rqst *, u32 *, | 292 | int nfs3svc_decode_symlinkargs(struct svc_rqst *, __be32 *, |
293 | struct nfsd3_symlinkargs *); | 293 | struct nfsd3_symlinkargs *); |
294 | int nfs3svc_decode_readdirargs(struct svc_rqst *, u32 *, | 294 | int nfs3svc_decode_readdirargs(struct svc_rqst *, __be32 *, |
295 | struct nfsd3_readdirargs *); | 295 | struct nfsd3_readdirargs *); |
296 | int nfs3svc_decode_readdirplusargs(struct svc_rqst *, u32 *, | 296 | int nfs3svc_decode_readdirplusargs(struct svc_rqst *, __be32 *, |
297 | struct nfsd3_readdirargs *); | 297 | struct nfsd3_readdirargs *); |
298 | int nfs3svc_decode_commitargs(struct svc_rqst *, u32 *, | 298 | int nfs3svc_decode_commitargs(struct svc_rqst *, __be32 *, |
299 | struct nfsd3_commitargs *); | 299 | struct nfsd3_commitargs *); |
300 | int nfs3svc_encode_voidres(struct svc_rqst *, u32 *, void *); | 300 | int nfs3svc_encode_voidres(struct svc_rqst *, __be32 *, void *); |
301 | int nfs3svc_encode_attrstat(struct svc_rqst *, u32 *, | 301 | int nfs3svc_encode_attrstat(struct svc_rqst *, __be32 *, |
302 | struct nfsd3_attrstat *); | 302 | struct nfsd3_attrstat *); |
303 | int nfs3svc_encode_wccstat(struct svc_rqst *, u32 *, | 303 | int nfs3svc_encode_wccstat(struct svc_rqst *, __be32 *, |
304 | struct nfsd3_attrstat *); | 304 | struct nfsd3_attrstat *); |
305 | int nfs3svc_encode_diropres(struct svc_rqst *, u32 *, | 305 | int nfs3svc_encode_diropres(struct svc_rqst *, __be32 *, |
306 | struct nfsd3_diropres *); | 306 | struct nfsd3_diropres *); |
307 | int nfs3svc_encode_accessres(struct svc_rqst *, u32 *, | 307 | int nfs3svc_encode_accessres(struct svc_rqst *, __be32 *, |
308 | struct nfsd3_accessres *); | 308 | struct nfsd3_accessres *); |
309 | int nfs3svc_encode_readlinkres(struct svc_rqst *, u32 *, | 309 | int nfs3svc_encode_readlinkres(struct svc_rqst *, __be32 *, |
310 | struct nfsd3_readlinkres *); | 310 | struct nfsd3_readlinkres *); |
311 | int nfs3svc_encode_readres(struct svc_rqst *, u32 *, struct nfsd3_readres *); | 311 | int nfs3svc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd3_readres *); |
312 | int nfs3svc_encode_writeres(struct svc_rqst *, u32 *, struct nfsd3_writeres *); | 312 | int nfs3svc_encode_writeres(struct svc_rqst *, __be32 *, struct nfsd3_writeres *); |
313 | int nfs3svc_encode_createres(struct svc_rqst *, u32 *, | 313 | int nfs3svc_encode_createres(struct svc_rqst *, __be32 *, |
314 | struct nfsd3_diropres *); | 314 | struct nfsd3_diropres *); |
315 | int nfs3svc_encode_renameres(struct svc_rqst *, u32 *, | 315 | int nfs3svc_encode_renameres(struct svc_rqst *, __be32 *, |
316 | struct nfsd3_renameres *); | 316 | struct nfsd3_renameres *); |
317 | int nfs3svc_encode_linkres(struct svc_rqst *, u32 *, | 317 | int nfs3svc_encode_linkres(struct svc_rqst *, __be32 *, |
318 | struct nfsd3_linkres *); | 318 | struct nfsd3_linkres *); |
319 | int nfs3svc_encode_readdirres(struct svc_rqst *, u32 *, | 319 | int nfs3svc_encode_readdirres(struct svc_rqst *, __be32 *, |
320 | struct nfsd3_readdirres *); | 320 | struct nfsd3_readdirres *); |
321 | int nfs3svc_encode_fsstatres(struct svc_rqst *, u32 *, | 321 | int nfs3svc_encode_fsstatres(struct svc_rqst *, __be32 *, |
322 | struct nfsd3_fsstatres *); | 322 | struct nfsd3_fsstatres *); |
323 | int nfs3svc_encode_fsinfores(struct svc_rqst *, u32 *, | 323 | int nfs3svc_encode_fsinfores(struct svc_rqst *, __be32 *, |
324 | struct nfsd3_fsinfores *); | 324 | struct nfsd3_fsinfores *); |
325 | int nfs3svc_encode_pathconfres(struct svc_rqst *, u32 *, | 325 | int nfs3svc_encode_pathconfres(struct svc_rqst *, __be32 *, |
326 | struct nfsd3_pathconfres *); | 326 | struct nfsd3_pathconfres *); |
327 | int nfs3svc_encode_commitres(struct svc_rqst *, u32 *, | 327 | int nfs3svc_encode_commitres(struct svc_rqst *, __be32 *, |
328 | struct nfsd3_commitres *); | 328 | struct nfsd3_commitres *); |
329 | 329 | ||
330 | int nfs3svc_release_fhandle(struct svc_rqst *, u32 *, | 330 | int nfs3svc_release_fhandle(struct svc_rqst *, __be32 *, |
331 | struct nfsd3_attrstat *); | 331 | struct nfsd3_attrstat *); |
332 | int nfs3svc_release_fhandle2(struct svc_rqst *, u32 *, | 332 | int nfs3svc_release_fhandle2(struct svc_rqst *, __be32 *, |
333 | struct nfsd3_fhandle_pair *); | 333 | struct nfsd3_fhandle_pair *); |
334 | int nfs3svc_encode_entry(struct readdir_cd *, const char *name, | 334 | int nfs3svc_encode_entry(struct readdir_cd *, const char *name, |
335 | int namlen, loff_t offset, ino_t ino, | 335 | int namlen, loff_t offset, ino_t ino, |
@@ -338,9 +338,9 @@ int nfs3svc_encode_entry_plus(struct readdir_cd *, const char *name, | |||
338 | int namlen, loff_t offset, ino_t ino, | 338 | int namlen, loff_t offset, ino_t ino, |
339 | unsigned int); | 339 | unsigned int); |
340 | /* Helper functions for NFSv3 ACL code */ | 340 | /* Helper functions for NFSv3 ACL code */ |
341 | u32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, | 341 | __be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, |
342 | struct svc_fh *fhp); | 342 | struct svc_fh *fhp); |
343 | u32 *nfs3svc_decode_fh(u32 *p, struct svc_fh *fhp); | 343 | __be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp); |
344 | 344 | ||
345 | 345 | ||
346 | #endif /* _LINUX_NFSD_XDR3_H */ | 346 | #endif /* _LINUX_NFSD_XDR3_H */ |
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h index 66e642762a07..45ca01b5f844 100644 --- a/include/linux/nfsd/xdr4.h +++ b/include/linux/nfsd/xdr4.h | |||
@@ -258,9 +258,9 @@ struct nfsd4_readdir { | |||
258 | struct svc_fh * rd_fhp; /* response */ | 258 | struct svc_fh * rd_fhp; /* response */ |
259 | 259 | ||
260 | struct readdir_cd common; | 260 | struct readdir_cd common; |
261 | u32 * buffer; | 261 | __be32 * buffer; |
262 | int buflen; | 262 | int buflen; |
263 | u32 * offset; | 263 | __be32 * offset; |
264 | }; | 264 | }; |
265 | 265 | ||
266 | struct nfsd4_release_lockowner { | 266 | struct nfsd4_release_lockowner { |
@@ -334,7 +334,7 @@ struct nfsd4_write { | |||
334 | 334 | ||
335 | struct nfsd4_op { | 335 | struct nfsd4_op { |
336 | int opnum; | 336 | int opnum; |
337 | int status; | 337 | __be32 status; |
338 | union { | 338 | union { |
339 | struct nfsd4_access access; | 339 | struct nfsd4_access access; |
340 | struct nfsd4_close close; | 340 | struct nfsd4_close close; |
@@ -371,12 +371,12 @@ struct nfsd4_op { | |||
371 | 371 | ||
372 | struct nfsd4_compoundargs { | 372 | struct nfsd4_compoundargs { |
373 | /* scratch variables for XDR decode */ | 373 | /* scratch variables for XDR decode */ |
374 | u32 * p; | 374 | __be32 * p; |
375 | u32 * end; | 375 | __be32 * end; |
376 | struct page ** pagelist; | 376 | struct page ** pagelist; |
377 | int pagelen; | 377 | int pagelen; |
378 | u32 tmp[8]; | 378 | __be32 tmp[8]; |
379 | u32 * tmpp; | 379 | __be32 * tmpp; |
380 | struct tmpbuf { | 380 | struct tmpbuf { |
381 | struct tmpbuf *next; | 381 | struct tmpbuf *next; |
382 | void (*release)(const void *); | 382 | void (*release)(const void *); |
@@ -395,15 +395,15 @@ struct nfsd4_compoundargs { | |||
395 | 395 | ||
396 | struct nfsd4_compoundres { | 396 | struct nfsd4_compoundres { |
397 | /* scratch variables for XDR encode */ | 397 | /* scratch variables for XDR encode */ |
398 | u32 * p; | 398 | __be32 * p; |
399 | u32 * end; | 399 | __be32 * end; |
400 | struct xdr_buf * xbuf; | 400 | struct xdr_buf * xbuf; |
401 | struct svc_rqst * rqstp; | 401 | struct svc_rqst * rqstp; |
402 | 402 | ||
403 | u32 taglen; | 403 | u32 taglen; |
404 | char * tag; | 404 | char * tag; |
405 | u32 opcnt; | 405 | u32 opcnt; |
406 | u32 * tagp; /* where to encode tag and opcount */ | 406 | __be32 * tagp; /* where to encode tag and opcount */ |
407 | }; | 407 | }; |
408 | 408 | ||
409 | #define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) | 409 | #define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) |
@@ -419,45 +419,45 @@ set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) | |||
419 | cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec; | 419 | cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec; |
420 | } | 420 | } |
421 | 421 | ||
422 | int nfs4svc_encode_voidres(struct svc_rqst *, u32 *, void *); | 422 | int nfs4svc_encode_voidres(struct svc_rqst *, __be32 *, void *); |
423 | int nfs4svc_decode_compoundargs(struct svc_rqst *, u32 *, | 423 | int nfs4svc_decode_compoundargs(struct svc_rqst *, __be32 *, |
424 | struct nfsd4_compoundargs *); | 424 | struct nfsd4_compoundargs *); |
425 | int nfs4svc_encode_compoundres(struct svc_rqst *, u32 *, | 425 | int nfs4svc_encode_compoundres(struct svc_rqst *, __be32 *, |
426 | struct nfsd4_compoundres *); | 426 | struct nfsd4_compoundres *); |
427 | void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *); | 427 | void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *); |
428 | void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op); | 428 | void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op); |
429 | int nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, | 429 | __be32 nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, |
430 | struct dentry *dentry, u32 *buffer, int *countp, | 430 | struct dentry *dentry, __be32 *buffer, int *countp, |
431 | u32 *bmval, struct svc_rqst *); | 431 | u32 *bmval, struct svc_rqst *); |
432 | extern int nfsd4_setclientid(struct svc_rqst *rqstp, | 432 | extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp, |
433 | struct nfsd4_setclientid *setclid); | 433 | struct nfsd4_setclientid *setclid); |
434 | extern int nfsd4_setclientid_confirm(struct svc_rqst *rqstp, | 434 | extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, |
435 | struct nfsd4_setclientid_confirm *setclientid_confirm); | 435 | struct nfsd4_setclientid_confirm *setclientid_confirm); |
436 | extern int nfsd4_process_open1(struct nfsd4_open *open); | 436 | extern __be32 nfsd4_process_open1(struct nfsd4_open *open); |
437 | extern int nfsd4_process_open2(struct svc_rqst *rqstp, | 437 | extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp, |
438 | struct svc_fh *current_fh, struct nfsd4_open *open); | 438 | struct svc_fh *current_fh, struct nfsd4_open *open); |
439 | extern int nfsd4_open_confirm(struct svc_rqst *rqstp, | 439 | extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp, |
440 | struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, | 440 | struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, |
441 | struct nfs4_stateowner **); | 441 | struct nfs4_stateowner **); |
442 | extern int nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 442 | extern __be32 nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
443 | struct nfsd4_close *close, | 443 | struct nfsd4_close *close, |
444 | struct nfs4_stateowner **replay_owner); | 444 | struct nfs4_stateowner **replay_owner); |
445 | extern int nfsd4_open_downgrade(struct svc_rqst *rqstp, | 445 | extern __be32 nfsd4_open_downgrade(struct svc_rqst *rqstp, |
446 | struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, | 446 | struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, |
447 | struct nfs4_stateowner **replay_owner); | 447 | struct nfs4_stateowner **replay_owner); |
448 | extern int nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 448 | extern __be32 nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
449 | struct nfsd4_lock *lock, | 449 | struct nfsd4_lock *lock, |
450 | struct nfs4_stateowner **replay_owner); | 450 | struct nfs4_stateowner **replay_owner); |
451 | extern int nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 451 | extern __be32 nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
452 | struct nfsd4_lockt *lockt); | 452 | struct nfsd4_lockt *lockt); |
453 | extern int nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 453 | extern __be32 nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
454 | struct nfsd4_locku *locku, | 454 | struct nfsd4_locku *locku, |
455 | struct nfs4_stateowner **replay_owner); | 455 | struct nfs4_stateowner **replay_owner); |
456 | extern int | 456 | extern __be32 |
457 | nfsd4_release_lockowner(struct svc_rqst *rqstp, | 457 | nfsd4_release_lockowner(struct svc_rqst *rqstp, |
458 | struct nfsd4_release_lockowner *rlockowner); | 458 | struct nfsd4_release_lockowner *rlockowner); |
459 | extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *); | 459 | extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *); |
460 | extern int nfsd4_delegreturn(struct svc_rqst *rqstp, | 460 | extern __be32 nfsd4_delegreturn(struct svc_rqst *rqstp, |
461 | struct svc_fh *current_fh, struct nfsd4_delegreturn *dr); | 461 | struct svc_fh *current_fh, struct nfsd4_delegreturn *dr); |
462 | #endif | 462 | #endif |
463 | 463 | ||