aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nfsd/xdr3.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-10-21 11:46:04 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-10-21 11:46:04 -0400
commit513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch)
treee8006368b6f643067486f92405a404757807d6da /include/linux/nfsd/xdr3.h
parent82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff)
parentc7a3bd177f248d01ee18a01d22048c80e071c331 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/nfsd/xdr3.h')
-rw-r--r--include/linux/nfsd/xdr3.h116
1 files changed, 57 insertions, 59 deletions
diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
index a4322741f8b9..79963867b0d7 100644
--- a/include/linux/nfsd/xdr3.h
+++ b/include/linux/nfsd/xdr3.h
@@ -33,7 +33,6 @@ struct nfsd3_readargs {
33 struct svc_fh fh; 33 struct svc_fh fh;
34 __u64 offset; 34 __u64 offset;
35 __u32 count; 35 __u32 count;
36 struct kvec vec[RPCSVC_MAXPAGES];
37 int vlen; 36 int vlen;
38}; 37};
39 38
@@ -43,7 +42,6 @@ struct nfsd3_writeargs {
43 __u32 count; 42 __u32 count;
44 int stable; 43 int stable;
45 __u32 len; 44 __u32 len;
46 struct kvec vec[RPCSVC_MAXPAGES];
47 int vlen; 45 int vlen;
48}; 46};
49 47
@@ -53,7 +51,7 @@ struct nfsd3_createargs {
53 int len; 51 int len;
54 int createmode; 52 int createmode;
55 struct iattr attrs; 53 struct iattr attrs;
56 __u32 * verf; 54 __be32 * verf;
57}; 55};
58 56
59struct nfsd3_mknodargs { 57struct nfsd3_mknodargs {
@@ -100,8 +98,8 @@ struct nfsd3_readdirargs {
100 __u64 cookie; 98 __u64 cookie;
101 __u32 dircount; 99 __u32 dircount;
102 __u32 count; 100 __u32 count;
103 __u32 * verf; 101 __be32 * verf;
104 u32 * buffer; 102 __be32 * buffer;
105}; 103};
106 104
107struct nfsd3_commitargs { 105struct nfsd3_commitargs {
@@ -124,79 +122,79 @@ struct nfsd3_setaclargs {
124}; 122};
125 123
126struct nfsd3_attrstat { 124struct nfsd3_attrstat {
127 __u32 status; 125 __be32 status;
128 struct svc_fh fh; 126 struct svc_fh fh;
129 struct kstat stat; 127 struct kstat stat;
130}; 128};
131 129
132/* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */ 130/* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */
133struct nfsd3_diropres { 131struct nfsd3_diropres {
134 __u32 status; 132 __be32 status;
135 struct svc_fh dirfh; 133 struct svc_fh dirfh;
136 struct svc_fh fh; 134 struct svc_fh fh;
137}; 135};
138 136
139struct nfsd3_accessres { 137struct nfsd3_accessres {
140 __u32 status; 138 __be32 status;
141 struct svc_fh fh; 139 struct svc_fh fh;
142 __u32 access; 140 __u32 access;
143}; 141};
144 142
145struct nfsd3_readlinkres { 143struct nfsd3_readlinkres {
146 __u32 status; 144 __be32 status;
147 struct svc_fh fh; 145 struct svc_fh fh;
148 __u32 len; 146 __u32 len;
149}; 147};
150 148
151struct nfsd3_readres { 149struct nfsd3_readres {
152 __u32 status; 150 __be32 status;
153 struct svc_fh fh; 151 struct svc_fh fh;
154 unsigned long count; 152 unsigned long count;
155 int eof; 153 int eof;
156}; 154};
157 155
158struct nfsd3_writeres { 156struct nfsd3_writeres {
159 __u32 status; 157 __be32 status;
160 struct svc_fh fh; 158 struct svc_fh fh;
161 unsigned long count; 159 unsigned long count;
162 int committed; 160 int committed;
163}; 161};
164 162
165struct nfsd3_renameres { 163struct nfsd3_renameres {
166 __u32 status; 164 __be32 status;
167 struct svc_fh ffh; 165 struct svc_fh ffh;
168 struct svc_fh tfh; 166 struct svc_fh tfh;
169}; 167};
170 168
171struct nfsd3_linkres { 169struct nfsd3_linkres {
172 __u32 status; 170 __be32 status;
173 struct svc_fh tfh; 171 struct svc_fh tfh;
174 struct svc_fh fh; 172 struct svc_fh fh;
175}; 173};
176 174
177struct nfsd3_readdirres { 175struct nfsd3_readdirres {
178 __u32 status; 176 __be32 status;
179 struct svc_fh fh; 177 struct svc_fh fh;
180 int count; 178 int count;
181 __u32 verf[2]; 179 __be32 verf[2];
182 180
183 struct readdir_cd common; 181 struct readdir_cd common;
184 u32 * buffer; 182 __be32 * buffer;
185 int buflen; 183 int buflen;
186 u32 * offset; 184 __be32 * offset;
187 u32 * offset1; 185 __be32 * offset1;
188 struct svc_rqst * rqstp; 186 struct svc_rqst * rqstp;
189 187
190}; 188};
191 189
192struct nfsd3_fsstatres { 190struct nfsd3_fsstatres {
193 __u32 status; 191 __be32 status;
194 struct kstatfs stats; 192 struct kstatfs stats;
195 __u32 invarsec; 193 __u32 invarsec;
196}; 194};
197 195
198struct nfsd3_fsinfores { 196struct nfsd3_fsinfores {
199 __u32 status; 197 __be32 status;
200 __u32 f_rtmax; 198 __u32 f_rtmax;
201 __u32 f_rtpref; 199 __u32 f_rtpref;
202 __u32 f_rtmult; 200 __u32 f_rtmult;
@@ -209,7 +207,7 @@ struct nfsd3_fsinfores {
209}; 207};
210 208
211struct nfsd3_pathconfres { 209struct nfsd3_pathconfres {
212 __u32 status; 210 __be32 status;
213 __u32 p_link_max; 211 __u32 p_link_max;
214 __u32 p_name_max; 212 __u32 p_name_max;
215 __u32 p_no_trunc; 213 __u32 p_no_trunc;
@@ -219,12 +217,12 @@ struct nfsd3_pathconfres {
219}; 217};
220 218
221struct nfsd3_commitres { 219struct nfsd3_commitres {
222 __u32 status; 220 __be32 status;
223 struct svc_fh fh; 221 struct svc_fh fh;
224}; 222};
225 223
226struct nfsd3_getaclres { 224struct nfsd3_getaclres {
227 __u32 status; 225 __be32 status;
228 struct svc_fh fh; 226 struct svc_fh fh;
229 int mask; 227 int mask;
230 struct posix_acl *acl_access; 228 struct posix_acl *acl_access;
@@ -268,70 +266,70 @@ union nfsd3_xdrstore {
268 266
269#define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore) 267#define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore)
270 268
271int nfs3svc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); 269int nfs3svc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *);
272int nfs3svc_decode_sattrargs(struct svc_rqst *, u32 *, 270int nfs3svc_decode_sattrargs(struct svc_rqst *, __be32 *,
273 struct nfsd3_sattrargs *); 271 struct nfsd3_sattrargs *);
274int nfs3svc_decode_diropargs(struct svc_rqst *, u32 *, 272int nfs3svc_decode_diropargs(struct svc_rqst *, __be32 *,
275 struct nfsd3_diropargs *); 273 struct nfsd3_diropargs *);
276int nfs3svc_decode_accessargs(struct svc_rqst *, u32 *, 274int nfs3svc_decode_accessargs(struct svc_rqst *, __be32 *,
277 struct nfsd3_accessargs *); 275 struct nfsd3_accessargs *);
278int nfs3svc_decode_readargs(struct svc_rqst *, u32 *, 276int nfs3svc_decode_readargs(struct svc_rqst *, __be32 *,
279 struct nfsd3_readargs *); 277 struct nfsd3_readargs *);
280int nfs3svc_decode_writeargs(struct svc_rqst *, u32 *, 278int nfs3svc_decode_writeargs(struct svc_rqst *, __be32 *,
281 struct nfsd3_writeargs *); 279 struct nfsd3_writeargs *);
282int nfs3svc_decode_createargs(struct svc_rqst *, u32 *, 280int nfs3svc_decode_createargs(struct svc_rqst *, __be32 *,
283 struct nfsd3_createargs *); 281 struct nfsd3_createargs *);
284int nfs3svc_decode_mkdirargs(struct svc_rqst *, u32 *, 282int nfs3svc_decode_mkdirargs(struct svc_rqst *, __be32 *,
285 struct nfsd3_createargs *); 283 struct nfsd3_createargs *);
286int nfs3svc_decode_mknodargs(struct svc_rqst *, u32 *, 284int nfs3svc_decode_mknodargs(struct svc_rqst *, __be32 *,
287 struct nfsd3_mknodargs *); 285 struct nfsd3_mknodargs *);
288int nfs3svc_decode_renameargs(struct svc_rqst *, u32 *, 286int nfs3svc_decode_renameargs(struct svc_rqst *, __be32 *,
289 struct nfsd3_renameargs *); 287 struct nfsd3_renameargs *);
290int nfs3svc_decode_readlinkargs(struct svc_rqst *, u32 *, 288int nfs3svc_decode_readlinkargs(struct svc_rqst *, __be32 *,
291 struct nfsd3_readlinkargs *); 289 struct nfsd3_readlinkargs *);
292int nfs3svc_decode_linkargs(struct svc_rqst *, u32 *, 290int nfs3svc_decode_linkargs(struct svc_rqst *, __be32 *,
293 struct nfsd3_linkargs *); 291 struct nfsd3_linkargs *);
294int nfs3svc_decode_symlinkargs(struct svc_rqst *, u32 *, 292int nfs3svc_decode_symlinkargs(struct svc_rqst *, __be32 *,
295 struct nfsd3_symlinkargs *); 293 struct nfsd3_symlinkargs *);
296int nfs3svc_decode_readdirargs(struct svc_rqst *, u32 *, 294int nfs3svc_decode_readdirargs(struct svc_rqst *, __be32 *,
297 struct nfsd3_readdirargs *); 295 struct nfsd3_readdirargs *);
298int nfs3svc_decode_readdirplusargs(struct svc_rqst *, u32 *, 296int nfs3svc_decode_readdirplusargs(struct svc_rqst *, __be32 *,
299 struct nfsd3_readdirargs *); 297 struct nfsd3_readdirargs *);
300int nfs3svc_decode_commitargs(struct svc_rqst *, u32 *, 298int nfs3svc_decode_commitargs(struct svc_rqst *, __be32 *,
301 struct nfsd3_commitargs *); 299 struct nfsd3_commitargs *);
302int nfs3svc_encode_voidres(struct svc_rqst *, u32 *, void *); 300int nfs3svc_encode_voidres(struct svc_rqst *, __be32 *, void *);
303int nfs3svc_encode_attrstat(struct svc_rqst *, u32 *, 301int nfs3svc_encode_attrstat(struct svc_rqst *, __be32 *,
304 struct nfsd3_attrstat *); 302 struct nfsd3_attrstat *);
305int nfs3svc_encode_wccstat(struct svc_rqst *, u32 *, 303int nfs3svc_encode_wccstat(struct svc_rqst *, __be32 *,
306 struct nfsd3_attrstat *); 304 struct nfsd3_attrstat *);
307int nfs3svc_encode_diropres(struct svc_rqst *, u32 *, 305int nfs3svc_encode_diropres(struct svc_rqst *, __be32 *,
308 struct nfsd3_diropres *); 306 struct nfsd3_diropres *);
309int nfs3svc_encode_accessres(struct svc_rqst *, u32 *, 307int nfs3svc_encode_accessres(struct svc_rqst *, __be32 *,
310 struct nfsd3_accessres *); 308 struct nfsd3_accessres *);
311int nfs3svc_encode_readlinkres(struct svc_rqst *, u32 *, 309int nfs3svc_encode_readlinkres(struct svc_rqst *, __be32 *,
312 struct nfsd3_readlinkres *); 310 struct nfsd3_readlinkres *);
313int nfs3svc_encode_readres(struct svc_rqst *, u32 *, struct nfsd3_readres *); 311int nfs3svc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd3_readres *);
314int nfs3svc_encode_writeres(struct svc_rqst *, u32 *, struct nfsd3_writeres *); 312int nfs3svc_encode_writeres(struct svc_rqst *, __be32 *, struct nfsd3_writeres *);
315int nfs3svc_encode_createres(struct svc_rqst *, u32 *, 313int nfs3svc_encode_createres(struct svc_rqst *, __be32 *,
316 struct nfsd3_diropres *); 314 struct nfsd3_diropres *);
317int nfs3svc_encode_renameres(struct svc_rqst *, u32 *, 315int nfs3svc_encode_renameres(struct svc_rqst *, __be32 *,
318 struct nfsd3_renameres *); 316 struct nfsd3_renameres *);
319int nfs3svc_encode_linkres(struct svc_rqst *, u32 *, 317int nfs3svc_encode_linkres(struct svc_rqst *, __be32 *,
320 struct nfsd3_linkres *); 318 struct nfsd3_linkres *);
321int nfs3svc_encode_readdirres(struct svc_rqst *, u32 *, 319int nfs3svc_encode_readdirres(struct svc_rqst *, __be32 *,
322 struct nfsd3_readdirres *); 320 struct nfsd3_readdirres *);
323int nfs3svc_encode_fsstatres(struct svc_rqst *, u32 *, 321int nfs3svc_encode_fsstatres(struct svc_rqst *, __be32 *,
324 struct nfsd3_fsstatres *); 322 struct nfsd3_fsstatres *);
325int nfs3svc_encode_fsinfores(struct svc_rqst *, u32 *, 323int nfs3svc_encode_fsinfores(struct svc_rqst *, __be32 *,
326 struct nfsd3_fsinfores *); 324 struct nfsd3_fsinfores *);
327int nfs3svc_encode_pathconfres(struct svc_rqst *, u32 *, 325int nfs3svc_encode_pathconfres(struct svc_rqst *, __be32 *,
328 struct nfsd3_pathconfres *); 326 struct nfsd3_pathconfres *);
329int nfs3svc_encode_commitres(struct svc_rqst *, u32 *, 327int nfs3svc_encode_commitres(struct svc_rqst *, __be32 *,
330 struct nfsd3_commitres *); 328 struct nfsd3_commitres *);
331 329
332int nfs3svc_release_fhandle(struct svc_rqst *, u32 *, 330int nfs3svc_release_fhandle(struct svc_rqst *, __be32 *,
333 struct nfsd3_attrstat *); 331 struct nfsd3_attrstat *);
334int nfs3svc_release_fhandle2(struct svc_rqst *, u32 *, 332int nfs3svc_release_fhandle2(struct svc_rqst *, __be32 *,
335 struct nfsd3_fhandle_pair *); 333 struct nfsd3_fhandle_pair *);
336int nfs3svc_encode_entry(struct readdir_cd *, const char *name, 334int nfs3svc_encode_entry(struct readdir_cd *, const char *name,
337 int namlen, loff_t offset, ino_t ino, 335 int namlen, loff_t offset, ino_t ino,
@@ -340,9 +338,9 @@ int nfs3svc_encode_entry_plus(struct readdir_cd *, const char *name,
340 int namlen, loff_t offset, ino_t ino, 338 int namlen, loff_t offset, ino_t ino,
341 unsigned int); 339 unsigned int);
342/* Helper functions for NFSv3 ACL code */ 340/* Helper functions for NFSv3 ACL code */
343u32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, 341__be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p,
344 struct svc_fh *fhp); 342 struct svc_fh *fhp);
345u32 *nfs3svc_decode_fh(u32 *p, struct svc_fh *fhp); 343__be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp);
346 344
347 345
348#endif /* _LINUX_NFSD_XDR3_H */ 346#endif /* _LINUX_NFSD_XDR3_H */