diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:28:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:41 -0400 |
commit | 91f07168cef8e99dd16f608fbc703e7a5af0237f (patch) | |
tree | 18ba76b4d8728637059741de9eb9caad40dbb483 /include/linux/nfsd | |
parent | 131a21c2177c267ab259fcd06947c6f593a7de8e (diff) |
[PATCH] xdr annotations: NFSv3 server
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/nfsd')
-rw-r--r-- | include/linux/nfsd/xdr3.h | 114 |
1 files changed, 57 insertions, 57 deletions
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 */ |