diff options
Diffstat (limited to 'fs/nfs/nfs3xdr.c')
-rw-r--r-- | fs/nfs/nfs3xdr.c | 2870 |
1 files changed, 2080 insertions, 790 deletions
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index 9769704f8ce6..183c6b123d0f 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c | |||
@@ -37,18 +37,16 @@ | |||
37 | #define NFS3_filename_sz (1+(NFS3_MAXNAMLEN>>2)) | 37 | #define NFS3_filename_sz (1+(NFS3_MAXNAMLEN>>2)) |
38 | #define NFS3_path_sz (1+(NFS3_MAXPATHLEN>>2)) | 38 | #define NFS3_path_sz (1+(NFS3_MAXPATHLEN>>2)) |
39 | #define NFS3_fattr_sz (21) | 39 | #define NFS3_fattr_sz (21) |
40 | #define NFS3_wcc_attr_sz (6) | 40 | #define NFS3_cookieverf_sz (NFS3_COOKIEVERFSIZE>>2) |
41 | #define NFS3_wcc_attr_sz (6) | ||
41 | #define NFS3_pre_op_attr_sz (1+NFS3_wcc_attr_sz) | 42 | #define NFS3_pre_op_attr_sz (1+NFS3_wcc_attr_sz) |
42 | #define NFS3_post_op_attr_sz (1+NFS3_fattr_sz) | 43 | #define NFS3_post_op_attr_sz (1+NFS3_fattr_sz) |
43 | #define NFS3_wcc_data_sz (NFS3_pre_op_attr_sz+NFS3_post_op_attr_sz) | 44 | #define NFS3_wcc_data_sz (NFS3_pre_op_attr_sz+NFS3_post_op_attr_sz) |
44 | #define NFS3_fsstat_sz | ||
45 | #define NFS3_fsinfo_sz | ||
46 | #define NFS3_pathconf_sz | ||
47 | #define NFS3_entry_sz (NFS3_filename_sz+3) | ||
48 | |||
49 | #define NFS3_sattrargs_sz (NFS3_fh_sz+NFS3_sattr_sz+3) | ||
50 | #define NFS3_diropargs_sz (NFS3_fh_sz+NFS3_filename_sz) | 45 | #define NFS3_diropargs_sz (NFS3_fh_sz+NFS3_filename_sz) |
51 | #define NFS3_removeargs_sz (NFS3_fh_sz+NFS3_filename_sz) | 46 | |
47 | #define NFS3_getattrargs_sz (NFS3_fh_sz) | ||
48 | #define NFS3_setattrargs_sz (NFS3_fh_sz+NFS3_sattr_sz+3) | ||
49 | #define NFS3_lookupargs_sz (NFS3_fh_sz+NFS3_filename_sz) | ||
52 | #define NFS3_accessargs_sz (NFS3_fh_sz+1) | 50 | #define NFS3_accessargs_sz (NFS3_fh_sz+1) |
53 | #define NFS3_readlinkargs_sz (NFS3_fh_sz) | 51 | #define NFS3_readlinkargs_sz (NFS3_fh_sz) |
54 | #define NFS3_readargs_sz (NFS3_fh_sz+3) | 52 | #define NFS3_readargs_sz (NFS3_fh_sz+3) |
@@ -57,14 +55,16 @@ | |||
57 | #define NFS3_mkdirargs_sz (NFS3_diropargs_sz+NFS3_sattr_sz) | 55 | #define NFS3_mkdirargs_sz (NFS3_diropargs_sz+NFS3_sattr_sz) |
58 | #define NFS3_symlinkargs_sz (NFS3_diropargs_sz+1+NFS3_sattr_sz) | 56 | #define NFS3_symlinkargs_sz (NFS3_diropargs_sz+1+NFS3_sattr_sz) |
59 | #define NFS3_mknodargs_sz (NFS3_diropargs_sz+2+NFS3_sattr_sz) | 57 | #define NFS3_mknodargs_sz (NFS3_diropargs_sz+2+NFS3_sattr_sz) |
58 | #define NFS3_removeargs_sz (NFS3_fh_sz+NFS3_filename_sz) | ||
60 | #define NFS3_renameargs_sz (NFS3_diropargs_sz+NFS3_diropargs_sz) | 59 | #define NFS3_renameargs_sz (NFS3_diropargs_sz+NFS3_diropargs_sz) |
61 | #define NFS3_linkargs_sz (NFS3_fh_sz+NFS3_diropargs_sz) | 60 | #define NFS3_linkargs_sz (NFS3_fh_sz+NFS3_diropargs_sz) |
62 | #define NFS3_readdirargs_sz (NFS3_fh_sz+2) | 61 | #define NFS3_readdirargs_sz (NFS3_fh_sz+NFS3_cookieverf_sz+3) |
62 | #define NFS3_readdirplusargs_sz (NFS3_fh_sz+NFS3_cookieverf_sz+4) | ||
63 | #define NFS3_commitargs_sz (NFS3_fh_sz+3) | 63 | #define NFS3_commitargs_sz (NFS3_fh_sz+3) |
64 | 64 | ||
65 | #define NFS3_attrstat_sz (1+NFS3_fattr_sz) | 65 | #define NFS3_getattrres_sz (1+NFS3_fattr_sz) |
66 | #define NFS3_wccstat_sz (1+NFS3_wcc_data_sz) | 66 | #define NFS3_setattrres_sz (1+NFS3_wcc_data_sz) |
67 | #define NFS3_removeres_sz (NFS3_wccstat_sz) | 67 | #define NFS3_removeres_sz (NFS3_setattrres_sz) |
68 | #define NFS3_lookupres_sz (1+NFS3_fh_sz+(2 * NFS3_post_op_attr_sz)) | 68 | #define NFS3_lookupres_sz (1+NFS3_fh_sz+(2 * NFS3_post_op_attr_sz)) |
69 | #define NFS3_accessres_sz (1+NFS3_post_op_attr_sz+1) | 69 | #define NFS3_accessres_sz (1+NFS3_post_op_attr_sz+1) |
70 | #define NFS3_readlinkres_sz (1+NFS3_post_op_attr_sz+1) | 70 | #define NFS3_readlinkres_sz (1+NFS3_post_op_attr_sz+1) |
@@ -101,1074 +101,2364 @@ static const umode_t nfs_type2fmt[] = { | |||
101 | }; | 101 | }; |
102 | 102 | ||
103 | /* | 103 | /* |
104 | * Common NFS XDR functions as inlines | 104 | * While encoding arguments, set up the reply buffer in advance to |
105 | * receive reply data directly into the page cache. | ||
105 | */ | 106 | */ |
106 | static inline __be32 * | 107 | static void prepare_reply_buffer(struct rpc_rqst *req, struct page **pages, |
107 | xdr_encode_fhandle(__be32 *p, const struct nfs_fh *fh) | 108 | unsigned int base, unsigned int len, |
109 | unsigned int bufsize) | ||
108 | { | 110 | { |
109 | return xdr_encode_array(p, fh->data, fh->size); | 111 | struct rpc_auth *auth = req->rq_cred->cr_auth; |
112 | unsigned int replen; | ||
113 | |||
114 | replen = RPC_REPHDRSIZE + auth->au_rslack + bufsize; | ||
115 | xdr_inline_pages(&req->rq_rcv_buf, replen << 2, pages, base, len); | ||
110 | } | 116 | } |
111 | 117 | ||
112 | static inline __be32 * | 118 | /* |
113 | xdr_decode_fhandle(__be32 *p, struct nfs_fh *fh) | 119 | * Handle decode buffer overflows out-of-line. |
120 | */ | ||
121 | static void print_overflow_msg(const char *func, const struct xdr_stream *xdr) | ||
114 | { | 122 | { |
115 | if ((fh->size = ntohl(*p++)) <= NFS3_FHSIZE) { | 123 | dprintk("NFS: %s prematurely hit the end of our receive buffer. " |
116 | memcpy(fh->data, p, fh->size); | 124 | "Remaining buffer length is %tu words.\n", |
117 | return p + XDR_QUADLEN(fh->size); | 125 | func, xdr->end - xdr->p); |
118 | } | ||
119 | return NULL; | ||
120 | } | 126 | } |
121 | 127 | ||
128 | |||
122 | /* | 129 | /* |
123 | * Encode/decode time. | 130 | * Encode/decode NFSv3 basic data types |
131 | * | ||
132 | * Basic NFSv3 data types are defined in section 2.5 of RFC 1813: | ||
133 | * "NFS Version 3 Protocol Specification". | ||
134 | * | ||
135 | * Not all basic data types have their own encoding and decoding | ||
136 | * functions. For run-time efficiency, some data types are encoded | ||
137 | * or decoded inline. | ||
124 | */ | 138 | */ |
125 | static inline __be32 * | 139 | |
126 | xdr_encode_time3(__be32 *p, struct timespec *timep) | 140 | static void encode_uint32(struct xdr_stream *xdr, u32 value) |
127 | { | 141 | { |
128 | *p++ = htonl(timep->tv_sec); | 142 | __be32 *p = xdr_reserve_space(xdr, 4); |
129 | *p++ = htonl(timep->tv_nsec); | 143 | *p = cpu_to_be32(value); |
130 | return p; | ||
131 | } | 144 | } |
132 | 145 | ||
133 | static inline __be32 * | 146 | static int decode_uint32(struct xdr_stream *xdr, u32 *value) |
134 | xdr_decode_time3(__be32 *p, struct timespec *timep) | ||
135 | { | 147 | { |
136 | timep->tv_sec = ntohl(*p++); | 148 | __be32 *p; |
137 | timep->tv_nsec = ntohl(*p++); | 149 | |
138 | return p; | 150 | p = xdr_inline_decode(xdr, 4); |
151 | if (unlikely(p == NULL)) | ||
152 | goto out_overflow; | ||
153 | *value = be32_to_cpup(p); | ||
154 | return 0; | ||
155 | out_overflow: | ||
156 | print_overflow_msg(__func__, xdr); | ||
157 | return -EIO; | ||
139 | } | 158 | } |
140 | 159 | ||
141 | static __be32 * | 160 | static int decode_uint64(struct xdr_stream *xdr, u64 *value) |
142 | xdr_decode_fattr(__be32 *p, struct nfs_fattr *fattr) | ||
143 | { | 161 | { |
144 | unsigned int type, major, minor; | 162 | __be32 *p; |
145 | umode_t fmode; | ||
146 | 163 | ||
147 | type = ntohl(*p++); | 164 | p = xdr_inline_decode(xdr, 8); |
148 | if (type > NF3FIFO) | 165 | if (unlikely(p == NULL)) |
149 | type = NF3NON; | 166 | goto out_overflow; |
150 | fmode = nfs_type2fmt[type]; | 167 | xdr_decode_hyper(p, value); |
151 | fattr->mode = (ntohl(*p++) & ~S_IFMT) | fmode; | 168 | return 0; |
152 | fattr->nlink = ntohl(*p++); | 169 | out_overflow: |
153 | fattr->uid = ntohl(*p++); | 170 | print_overflow_msg(__func__, xdr); |
154 | fattr->gid = ntohl(*p++); | 171 | return -EIO; |
155 | p = xdr_decode_hyper(p, &fattr->size); | 172 | } |
156 | p = xdr_decode_hyper(p, &fattr->du.nfs3.used); | ||
157 | |||
158 | /* Turn remote device info into Linux-specific dev_t */ | ||
159 | major = ntohl(*p++); | ||
160 | minor = ntohl(*p++); | ||
161 | fattr->rdev = MKDEV(major, minor); | ||
162 | if (MAJOR(fattr->rdev) != major || MINOR(fattr->rdev) != minor) | ||
163 | fattr->rdev = 0; | ||
164 | 173 | ||
165 | p = xdr_decode_hyper(p, &fattr->fsid.major); | 174 | /* |
166 | fattr->fsid.minor = 0; | 175 | * fileid3 |
167 | p = xdr_decode_hyper(p, &fattr->fileid); | 176 | * |
168 | p = xdr_decode_time3(p, &fattr->atime); | 177 | * typedef uint64 fileid3; |
169 | p = xdr_decode_time3(p, &fattr->mtime); | 178 | */ |
170 | p = xdr_decode_time3(p, &fattr->ctime); | 179 | static __be32 *xdr_decode_fileid3(__be32 *p, u64 *fileid) |
180 | { | ||
181 | return xdr_decode_hyper(p, fileid); | ||
182 | } | ||
171 | 183 | ||
172 | /* Update the mode bits */ | 184 | static int decode_fileid3(struct xdr_stream *xdr, u64 *fileid) |
173 | fattr->valid |= NFS_ATTR_FATTR_V3; | 185 | { |
174 | return p; | 186 | return decode_uint64(xdr, fileid); |
175 | } | 187 | } |
176 | 188 | ||
177 | static inline __be32 * | 189 | /* |
178 | xdr_encode_sattr(__be32 *p, struct iattr *attr) | 190 | * filename3 |
191 | * | ||
192 | * typedef string filename3<>; | ||
193 | */ | ||
194 | static void encode_filename3(struct xdr_stream *xdr, | ||
195 | const char *name, u32 length) | ||
179 | { | 196 | { |
180 | if (attr->ia_valid & ATTR_MODE) { | 197 | __be32 *p; |
181 | *p++ = xdr_one; | 198 | |
182 | *p++ = htonl(attr->ia_mode & S_IALLUGO); | 199 | BUG_ON(length > NFS3_MAXNAMLEN); |
183 | } else { | 200 | p = xdr_reserve_space(xdr, 4 + length); |
184 | *p++ = xdr_zero; | 201 | xdr_encode_opaque(p, name, length); |
185 | } | ||
186 | if (attr->ia_valid & ATTR_UID) { | ||
187 | *p++ = xdr_one; | ||
188 | *p++ = htonl(attr->ia_uid); | ||
189 | } else { | ||
190 | *p++ = xdr_zero; | ||
191 | } | ||
192 | if (attr->ia_valid & ATTR_GID) { | ||
193 | *p++ = xdr_one; | ||
194 | *p++ = htonl(attr->ia_gid); | ||
195 | } else { | ||
196 | *p++ = xdr_zero; | ||
197 | } | ||
198 | if (attr->ia_valid & ATTR_SIZE) { | ||
199 | *p++ = xdr_one; | ||
200 | p = xdr_encode_hyper(p, (__u64) attr->ia_size); | ||
201 | } else { | ||
202 | *p++ = xdr_zero; | ||
203 | } | ||
204 | if (attr->ia_valid & ATTR_ATIME_SET) { | ||
205 | *p++ = xdr_two; | ||
206 | p = xdr_encode_time3(p, &attr->ia_atime); | ||
207 | } else if (attr->ia_valid & ATTR_ATIME) { | ||
208 | *p++ = xdr_one; | ||
209 | } else { | ||
210 | *p++ = xdr_zero; | ||
211 | } | ||
212 | if (attr->ia_valid & ATTR_MTIME_SET) { | ||
213 | *p++ = xdr_two; | ||
214 | p = xdr_encode_time3(p, &attr->ia_mtime); | ||
215 | } else if (attr->ia_valid & ATTR_MTIME) { | ||
216 | *p++ = xdr_one; | ||
217 | } else { | ||
218 | *p++ = xdr_zero; | ||
219 | } | ||
220 | return p; | ||
221 | } | 202 | } |
222 | 203 | ||
223 | static inline __be32 * | 204 | static int decode_inline_filename3(struct xdr_stream *xdr, |
224 | xdr_decode_wcc_attr(__be32 *p, struct nfs_fattr *fattr) | 205 | const char **name, u32 *length) |
225 | { | 206 | { |
226 | p = xdr_decode_hyper(p, &fattr->pre_size); | 207 | __be32 *p; |
227 | p = xdr_decode_time3(p, &fattr->pre_mtime); | 208 | u32 count; |
228 | p = xdr_decode_time3(p, &fattr->pre_ctime); | 209 | |
229 | fattr->valid |= NFS_ATTR_FATTR_PRESIZE | 210 | p = xdr_inline_decode(xdr, 4); |
230 | | NFS_ATTR_FATTR_PREMTIME | 211 | if (unlikely(p == NULL)) |
231 | | NFS_ATTR_FATTR_PRECTIME; | 212 | goto out_overflow; |
232 | return p; | 213 | count = be32_to_cpup(p); |
214 | if (count > NFS3_MAXNAMLEN) | ||
215 | goto out_nametoolong; | ||
216 | p = xdr_inline_decode(xdr, count); | ||
217 | if (unlikely(p == NULL)) | ||
218 | goto out_overflow; | ||
219 | *name = (const char *)p; | ||
220 | *length = count; | ||
221 | return 0; | ||
222 | |||
223 | out_nametoolong: | ||
224 | dprintk("NFS: returned filename too long: %u\n", count); | ||
225 | return -ENAMETOOLONG; | ||
226 | out_overflow: | ||
227 | print_overflow_msg(__func__, xdr); | ||
228 | return -EIO; | ||
233 | } | 229 | } |
234 | 230 | ||
235 | static inline __be32 * | 231 | /* |
236 | xdr_decode_post_op_attr(__be32 *p, struct nfs_fattr *fattr) | 232 | * nfspath3 |
233 | * | ||
234 | * typedef string nfspath3<>; | ||
235 | */ | ||
236 | static void encode_nfspath3(struct xdr_stream *xdr, struct page **pages, | ||
237 | const u32 length) | ||
237 | { | 238 | { |
238 | if (*p++) | 239 | BUG_ON(length > NFS3_MAXPATHLEN); |
239 | p = xdr_decode_fattr(p, fattr); | 240 | encode_uint32(xdr, length); |
240 | return p; | 241 | xdr_write_pages(xdr, pages, 0, length); |
241 | } | 242 | } |
242 | 243 | ||
243 | static inline __be32 * | 244 | static int decode_nfspath3(struct xdr_stream *xdr) |
244 | xdr_decode_pre_op_attr(__be32 *p, struct nfs_fattr *fattr) | ||
245 | { | 245 | { |
246 | if (*p++) | 246 | u32 recvd, count; |
247 | return xdr_decode_wcc_attr(p, fattr); | 247 | size_t hdrlen; |
248 | return p; | 248 | __be32 *p; |
249 | |||
250 | p = xdr_inline_decode(xdr, 4); | ||
251 | if (unlikely(p == NULL)) | ||
252 | goto out_overflow; | ||
253 | count = be32_to_cpup(p); | ||
254 | if (unlikely(count >= xdr->buf->page_len || count > NFS3_MAXPATHLEN)) | ||
255 | goto out_nametoolong; | ||
256 | hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base; | ||
257 | recvd = xdr->buf->len - hdrlen; | ||
258 | if (unlikely(count > recvd)) | ||
259 | goto out_cheating; | ||
260 | |||
261 | xdr_read_pages(xdr, count); | ||
262 | xdr_terminate_string(xdr->buf, count); | ||
263 | return 0; | ||
264 | |||
265 | out_nametoolong: | ||
266 | dprintk("NFS: returned pathname too long: %u\n", count); | ||
267 | return -ENAMETOOLONG; | ||
268 | out_cheating: | ||
269 | dprintk("NFS: server cheating in pathname result: " | ||
270 | "count %u > recvd %u\n", count, recvd); | ||
271 | return -EIO; | ||
272 | out_overflow: | ||
273 | print_overflow_msg(__func__, xdr); | ||
274 | return -EIO; | ||
249 | } | 275 | } |
250 | 276 | ||
277 | /* | ||
278 | * cookie3 | ||
279 | * | ||
280 | * typedef uint64 cookie3 | ||
281 | */ | ||
282 | static __be32 *xdr_encode_cookie3(__be32 *p, u64 cookie) | ||
283 | { | ||
284 | return xdr_encode_hyper(p, cookie); | ||
285 | } | ||
251 | 286 | ||
252 | static inline __be32 * | 287 | static int decode_cookie3(struct xdr_stream *xdr, u64 *cookie) |
253 | xdr_decode_wcc_data(__be32 *p, struct nfs_fattr *fattr) | ||
254 | { | 288 | { |
255 | p = xdr_decode_pre_op_attr(p, fattr); | 289 | return decode_uint64(xdr, cookie); |
256 | return xdr_decode_post_op_attr(p, fattr); | ||
257 | } | 290 | } |
258 | 291 | ||
259 | /* | 292 | /* |
260 | * NFS encode functions | 293 | * cookieverf3 |
294 | * | ||
295 | * typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE]; | ||
261 | */ | 296 | */ |
297 | static __be32 *xdr_encode_cookieverf3(__be32 *p, const __be32 *verifier) | ||
298 | { | ||
299 | memcpy(p, verifier, NFS3_COOKIEVERFSIZE); | ||
300 | return p + XDR_QUADLEN(NFS3_COOKIEVERFSIZE); | ||
301 | } | ||
302 | |||
303 | static int decode_cookieverf3(struct xdr_stream *xdr, __be32 *verifier) | ||
304 | { | ||
305 | __be32 *p; | ||
306 | |||
307 | p = xdr_inline_decode(xdr, NFS3_COOKIEVERFSIZE); | ||
308 | if (unlikely(p == NULL)) | ||
309 | goto out_overflow; | ||
310 | memcpy(verifier, p, NFS3_COOKIEVERFSIZE); | ||
311 | return 0; | ||
312 | out_overflow: | ||
313 | print_overflow_msg(__func__, xdr); | ||
314 | return -EIO; | ||
315 | } | ||
262 | 316 | ||
263 | /* | 317 | /* |
264 | * Encode file handle argument | 318 | * createverf3 |
319 | * | ||
320 | * typedef opaque createverf3[NFS3_CREATEVERFSIZE]; | ||
265 | */ | 321 | */ |
266 | static int | 322 | static void encode_createverf3(struct xdr_stream *xdr, const __be32 *verifier) |
267 | nfs3_xdr_fhandle(struct rpc_rqst *req, __be32 *p, struct nfs_fh *fh) | ||
268 | { | 323 | { |
269 | p = xdr_encode_fhandle(p, fh); | 324 | __be32 *p; |
270 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 325 | |
326 | p = xdr_reserve_space(xdr, NFS3_CREATEVERFSIZE); | ||
327 | memcpy(p, verifier, NFS3_CREATEVERFSIZE); | ||
328 | } | ||
329 | |||
330 | static int decode_writeverf3(struct xdr_stream *xdr, __be32 *verifier) | ||
331 | { | ||
332 | __be32 *p; | ||
333 | |||
334 | p = xdr_inline_decode(xdr, NFS3_WRITEVERFSIZE); | ||
335 | if (unlikely(p == NULL)) | ||
336 | goto out_overflow; | ||
337 | memcpy(verifier, p, NFS3_WRITEVERFSIZE); | ||
271 | return 0; | 338 | return 0; |
339 | out_overflow: | ||
340 | print_overflow_msg(__func__, xdr); | ||
341 | return -EIO; | ||
272 | } | 342 | } |
273 | 343 | ||
274 | /* | 344 | /* |
275 | * Encode SETATTR arguments | 345 | * size3 |
346 | * | ||
347 | * typedef uint64 size3; | ||
276 | */ | 348 | */ |
277 | static int | 349 | static __be32 *xdr_decode_size3(__be32 *p, u64 *size) |
278 | nfs3_xdr_sattrargs(struct rpc_rqst *req, __be32 *p, struct nfs3_sattrargs *args) | 350 | { |
279 | { | 351 | return xdr_decode_hyper(p, size); |
280 | p = xdr_encode_fhandle(p, args->fh); | ||
281 | p = xdr_encode_sattr(p, args->sattr); | ||
282 | *p++ = htonl(args->guard); | ||
283 | if (args->guard) | ||
284 | p = xdr_encode_time3(p, &args->guardtime); | ||
285 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
286 | return 0; | ||
287 | } | 352 | } |
288 | 353 | ||
289 | /* | 354 | /* |
290 | * Encode directory ops argument | 355 | * nfsstat3 |
356 | * | ||
357 | * enum nfsstat3 { | ||
358 | * NFS3_OK = 0, | ||
359 | * ... | ||
360 | * } | ||
291 | */ | 361 | */ |
292 | static int | 362 | #define NFS3_OK NFS_OK |
293 | nfs3_xdr_diropargs(struct rpc_rqst *req, __be32 *p, struct nfs3_diropargs *args) | 363 | |
364 | static int decode_nfsstat3(struct xdr_stream *xdr, enum nfs_stat *status) | ||
294 | { | 365 | { |
295 | p = xdr_encode_fhandle(p, args->fh); | 366 | __be32 *p; |
296 | p = xdr_encode_array(p, args->name, args->len); | 367 | |
297 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 368 | p = xdr_inline_decode(xdr, 4); |
369 | if (unlikely(p == NULL)) | ||
370 | goto out_overflow; | ||
371 | *status = be32_to_cpup(p); | ||
298 | return 0; | 372 | return 0; |
373 | out_overflow: | ||
374 | print_overflow_msg(__func__, xdr); | ||
375 | return -EIO; | ||
299 | } | 376 | } |
300 | 377 | ||
301 | /* | 378 | /* |
302 | * Encode REMOVE argument | 379 | * ftype3 |
380 | * | ||
381 | * enum ftype3 { | ||
382 | * NF3REG = 1, | ||
383 | * NF3DIR = 2, | ||
384 | * NF3BLK = 3, | ||
385 | * NF3CHR = 4, | ||
386 | * NF3LNK = 5, | ||
387 | * NF3SOCK = 6, | ||
388 | * NF3FIFO = 7 | ||
389 | * }; | ||
303 | */ | 390 | */ |
304 | static int | 391 | static void encode_ftype3(struct xdr_stream *xdr, const u32 type) |
305 | nfs3_xdr_removeargs(struct rpc_rqst *req, __be32 *p, const struct nfs_removeargs *args) | ||
306 | { | 392 | { |
307 | p = xdr_encode_fhandle(p, args->fh); | 393 | BUG_ON(type > NF3FIFO); |
308 | p = xdr_encode_array(p, args->name.name, args->name.len); | 394 | encode_uint32(xdr, type); |
309 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 395 | } |
310 | return 0; | 396 | |
397 | static __be32 *xdr_decode_ftype3(__be32 *p, umode_t *mode) | ||
398 | { | ||
399 | u32 type; | ||
400 | |||
401 | type = be32_to_cpup(p++); | ||
402 | if (type > NF3FIFO) | ||
403 | type = NF3NON; | ||
404 | *mode = nfs_type2fmt[type]; | ||
405 | return p; | ||
311 | } | 406 | } |
312 | 407 | ||
313 | /* | 408 | /* |
314 | * Encode access() argument | 409 | * specdata3 |
410 | * | ||
411 | * struct specdata3 { | ||
412 | * uint32 specdata1; | ||
413 | * uint32 specdata2; | ||
414 | * }; | ||
315 | */ | 415 | */ |
316 | static int | 416 | static void encode_specdata3(struct xdr_stream *xdr, const dev_t rdev) |
317 | nfs3_xdr_accessargs(struct rpc_rqst *req, __be32 *p, struct nfs3_accessargs *args) | ||
318 | { | 417 | { |
319 | p = xdr_encode_fhandle(p, args->fh); | 418 | __be32 *p; |
320 | *p++ = htonl(args->access); | 419 | |
321 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 420 | p = xdr_reserve_space(xdr, 8); |
322 | return 0; | 421 | *p++ = cpu_to_be32(MAJOR(rdev)); |
422 | *p = cpu_to_be32(MINOR(rdev)); | ||
423 | } | ||
424 | |||
425 | static __be32 *xdr_decode_specdata3(__be32 *p, dev_t *rdev) | ||
426 | { | ||
427 | unsigned int major, minor; | ||
428 | |||
429 | major = be32_to_cpup(p++); | ||
430 | minor = be32_to_cpup(p++); | ||
431 | *rdev = MKDEV(major, minor); | ||
432 | if (MAJOR(*rdev) != major || MINOR(*rdev) != minor) | ||
433 | *rdev = 0; | ||
434 | return p; | ||
323 | } | 435 | } |
324 | 436 | ||
325 | /* | 437 | /* |
326 | * Arguments to a READ call. Since we read data directly into the page | 438 | * nfs_fh3 |
327 | * cache, we also set up the reply iovec here so that iov[1] points | 439 | * |
328 | * exactly to the page we want to fetch. | 440 | * struct nfs_fh3 { |
441 | * opaque data<NFS3_FHSIZE>; | ||
442 | * }; | ||
329 | */ | 443 | */ |
330 | static int | 444 | static void encode_nfs_fh3(struct xdr_stream *xdr, const struct nfs_fh *fh) |
331 | nfs3_xdr_readargs(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args) | ||
332 | { | 445 | { |
333 | struct rpc_auth *auth = req->rq_cred->cr_auth; | 446 | __be32 *p; |
334 | unsigned int replen; | ||
335 | u32 count = args->count; | ||
336 | 447 | ||
337 | p = xdr_encode_fhandle(p, args->fh); | 448 | BUG_ON(fh->size > NFS3_FHSIZE); |
338 | p = xdr_encode_hyper(p, args->offset); | 449 | p = xdr_reserve_space(xdr, 4 + fh->size); |
339 | *p++ = htonl(count); | 450 | xdr_encode_opaque(p, fh->data, fh->size); |
340 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 451 | } |
341 | 452 | ||
342 | /* Inline the page array */ | 453 | static int decode_nfs_fh3(struct xdr_stream *xdr, struct nfs_fh *fh) |
343 | replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS3_readres_sz) << 2; | 454 | { |
344 | xdr_inline_pages(&req->rq_rcv_buf, replen, | 455 | u32 length; |
345 | args->pages, args->pgbase, count); | 456 | __be32 *p; |
346 | req->rq_rcv_buf.flags |= XDRBUF_READ; | 457 | |
458 | p = xdr_inline_decode(xdr, 4); | ||
459 | if (unlikely(p == NULL)) | ||
460 | goto out_overflow; | ||
461 | length = be32_to_cpup(p++); | ||
462 | if (unlikely(length > NFS3_FHSIZE)) | ||
463 | goto out_toobig; | ||
464 | p = xdr_inline_decode(xdr, length); | ||
465 | if (unlikely(p == NULL)) | ||
466 | goto out_overflow; | ||
467 | fh->size = length; | ||
468 | memcpy(fh->data, p, length); | ||
347 | return 0; | 469 | return 0; |
470 | out_toobig: | ||
471 | dprintk("NFS: file handle size (%u) too big\n", length); | ||
472 | return -E2BIG; | ||
473 | out_overflow: | ||
474 | print_overflow_msg(__func__, xdr); | ||
475 | return -EIO; | ||
476 | } | ||
477 | |||
478 | static void zero_nfs_fh3(struct nfs_fh *fh) | ||
479 | { | ||
480 | memset(fh, 0, sizeof(*fh)); | ||
348 | } | 481 | } |
349 | 482 | ||
350 | /* | 483 | /* |
351 | * Write arguments. Splice the buffer to be written into the iovec. | 484 | * nfstime3 |
485 | * | ||
486 | * struct nfstime3 { | ||
487 | * uint32 seconds; | ||
488 | * uint32 nseconds; | ||
489 | * }; | ||
352 | */ | 490 | */ |
353 | static int | 491 | static __be32 *xdr_encode_nfstime3(__be32 *p, const struct timespec *timep) |
354 | nfs3_xdr_writeargs(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) | ||
355 | { | 492 | { |
356 | struct xdr_buf *sndbuf = &req->rq_snd_buf; | 493 | *p++ = cpu_to_be32(timep->tv_sec); |
357 | u32 count = args->count; | 494 | *p++ = cpu_to_be32(timep->tv_nsec); |
495 | return p; | ||
496 | } | ||
358 | 497 | ||
359 | p = xdr_encode_fhandle(p, args->fh); | 498 | static __be32 *xdr_decode_nfstime3(__be32 *p, struct timespec *timep) |
360 | p = xdr_encode_hyper(p, args->offset); | 499 | { |
361 | *p++ = htonl(count); | 500 | timep->tv_sec = be32_to_cpup(p++); |
362 | *p++ = htonl(args->stable); | 501 | timep->tv_nsec = be32_to_cpup(p++); |
363 | *p++ = htonl(count); | 502 | return p; |
364 | sndbuf->len = xdr_adjust_iovec(sndbuf->head, p); | ||
365 | |||
366 | /* Copy the page array */ | ||
367 | xdr_encode_pages(sndbuf, args->pages, args->pgbase, count); | ||
368 | sndbuf->flags |= XDRBUF_WRITE; | ||
369 | return 0; | ||
370 | } | 503 | } |
371 | 504 | ||
372 | /* | 505 | /* |
373 | * Encode CREATE arguments | 506 | * sattr3 |
507 | * | ||
508 | * enum time_how { | ||
509 | * DONT_CHANGE = 0, | ||
510 | * SET_TO_SERVER_TIME = 1, | ||
511 | * SET_TO_CLIENT_TIME = 2 | ||
512 | * }; | ||
513 | * | ||
514 | * union set_mode3 switch (bool set_it) { | ||
515 | * case TRUE: | ||
516 | * mode3 mode; | ||
517 | * default: | ||
518 | * void; | ||
519 | * }; | ||
520 | * | ||
521 | * union set_uid3 switch (bool set_it) { | ||
522 | * case TRUE: | ||
523 | * uid3 uid; | ||
524 | * default: | ||
525 | * void; | ||
526 | * }; | ||
527 | * | ||
528 | * union set_gid3 switch (bool set_it) { | ||
529 | * case TRUE: | ||
530 | * gid3 gid; | ||
531 | * default: | ||
532 | * void; | ||
533 | * }; | ||
534 | * | ||
535 | * union set_size3 switch (bool set_it) { | ||
536 | * case TRUE: | ||
537 | * size3 size; | ||
538 | * default: | ||
539 | * void; | ||
540 | * }; | ||
541 | * | ||
542 | * union set_atime switch (time_how set_it) { | ||
543 | * case SET_TO_CLIENT_TIME: | ||
544 | * nfstime3 atime; | ||
545 | * default: | ||
546 | * void; | ||
547 | * }; | ||
548 | * | ||
549 | * union set_mtime switch (time_how set_it) { | ||
550 | * case SET_TO_CLIENT_TIME: | ||
551 | * nfstime3 mtime; | ||
552 | * default: | ||
553 | * void; | ||
554 | * }; | ||
555 | * | ||
556 | * struct sattr3 { | ||
557 | * set_mode3 mode; | ||
558 | * set_uid3 uid; | ||
559 | * set_gid3 gid; | ||
560 | * set_size3 size; | ||
561 | * set_atime atime; | ||
562 | * set_mtime mtime; | ||
563 | * }; | ||
374 | */ | 564 | */ |
375 | static int | 565 | static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr) |
376 | nfs3_xdr_createargs(struct rpc_rqst *req, __be32 *p, struct nfs3_createargs *args) | ||
377 | { | 566 | { |
378 | p = xdr_encode_fhandle(p, args->fh); | 567 | u32 nbytes; |
379 | p = xdr_encode_array(p, args->name, args->len); | 568 | __be32 *p; |
380 | 569 | ||
381 | *p++ = htonl(args->createmode); | 570 | /* |
382 | if (args->createmode == NFS3_CREATE_EXCLUSIVE) { | 571 | * In order to make only a single xdr_reserve_space() call, |
383 | *p++ = args->verifier[0]; | 572 | * pre-compute the total number of bytes to be reserved. |
384 | *p++ = args->verifier[1]; | 573 | * Six boolean values, one for each set_foo field, are always |
574 | * present in the encoded result, so start there. | ||
575 | */ | ||
576 | nbytes = 6 * 4; | ||
577 | if (attr->ia_valid & ATTR_MODE) | ||
578 | nbytes += 4; | ||
579 | if (attr->ia_valid & ATTR_UID) | ||
580 | nbytes += 4; | ||
581 | if (attr->ia_valid & ATTR_GID) | ||
582 | nbytes += 4; | ||
583 | if (attr->ia_valid & ATTR_SIZE) | ||
584 | nbytes += 8; | ||
585 | if (attr->ia_valid & ATTR_ATIME_SET) | ||
586 | nbytes += 8; | ||
587 | if (attr->ia_valid & ATTR_MTIME_SET) | ||
588 | nbytes += 8; | ||
589 | p = xdr_reserve_space(xdr, nbytes); | ||
590 | |||
591 | if (attr->ia_valid & ATTR_MODE) { | ||
592 | *p++ = xdr_one; | ||
593 | *p++ = cpu_to_be32(attr->ia_mode & S_IALLUGO); | ||
385 | } else | 594 | } else |
386 | p = xdr_encode_sattr(p, args->sattr); | 595 | *p++ = xdr_zero; |
387 | 596 | ||
388 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 597 | if (attr->ia_valid & ATTR_UID) { |
389 | return 0; | 598 | *p++ = xdr_one; |
599 | *p++ = cpu_to_be32(attr->ia_uid); | ||
600 | } else | ||
601 | *p++ = xdr_zero; | ||
602 | |||
603 | if (attr->ia_valid & ATTR_GID) { | ||
604 | *p++ = xdr_one; | ||
605 | *p++ = cpu_to_be32(attr->ia_gid); | ||
606 | } else | ||
607 | *p++ = xdr_zero; | ||
608 | |||
609 | if (attr->ia_valid & ATTR_SIZE) { | ||
610 | *p++ = xdr_one; | ||
611 | p = xdr_encode_hyper(p, (u64)attr->ia_size); | ||
612 | } else | ||
613 | *p++ = xdr_zero; | ||
614 | |||
615 | if (attr->ia_valid & ATTR_ATIME_SET) { | ||
616 | *p++ = xdr_two; | ||
617 | p = xdr_encode_nfstime3(p, &attr->ia_atime); | ||
618 | } else if (attr->ia_valid & ATTR_ATIME) { | ||
619 | *p++ = xdr_one; | ||
620 | } else | ||
621 | *p++ = xdr_zero; | ||
622 | |||
623 | if (attr->ia_valid & ATTR_MTIME_SET) { | ||
624 | *p++ = xdr_two; | ||
625 | xdr_encode_nfstime3(p, &attr->ia_mtime); | ||
626 | } else if (attr->ia_valid & ATTR_MTIME) { | ||
627 | *p = xdr_one; | ||
628 | } else | ||
629 | *p = xdr_zero; | ||
390 | } | 630 | } |
391 | 631 | ||
392 | /* | 632 | /* |
393 | * Encode MKDIR arguments | 633 | * fattr3 |
634 | * | ||
635 | * struct fattr3 { | ||
636 | * ftype3 type; | ||
637 | * mode3 mode; | ||
638 | * uint32 nlink; | ||
639 | * uid3 uid; | ||
640 | * gid3 gid; | ||
641 | * size3 size; | ||
642 | * size3 used; | ||
643 | * specdata3 rdev; | ||
644 | * uint64 fsid; | ||
645 | * fileid3 fileid; | ||
646 | * nfstime3 atime; | ||
647 | * nfstime3 mtime; | ||
648 | * nfstime3 ctime; | ||
649 | * }; | ||
394 | */ | 650 | */ |
395 | static int | 651 | static int decode_fattr3(struct xdr_stream *xdr, struct nfs_fattr *fattr) |
396 | nfs3_xdr_mkdirargs(struct rpc_rqst *req, __be32 *p, struct nfs3_mkdirargs *args) | ||
397 | { | 652 | { |
398 | p = xdr_encode_fhandle(p, args->fh); | 653 | umode_t fmode; |
399 | p = xdr_encode_array(p, args->name, args->len); | 654 | __be32 *p; |
400 | p = xdr_encode_sattr(p, args->sattr); | 655 | |
401 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 656 | p = xdr_inline_decode(xdr, NFS3_fattr_sz << 2); |
657 | if (unlikely(p == NULL)) | ||
658 | goto out_overflow; | ||
659 | |||
660 | p = xdr_decode_ftype3(p, &fmode); | ||
661 | |||
662 | fattr->mode = (be32_to_cpup(p++) & ~S_IFMT) | fmode; | ||
663 | fattr->nlink = be32_to_cpup(p++); | ||
664 | fattr->uid = be32_to_cpup(p++); | ||
665 | fattr->gid = be32_to_cpup(p++); | ||
666 | |||
667 | p = xdr_decode_size3(p, &fattr->size); | ||
668 | p = xdr_decode_size3(p, &fattr->du.nfs3.used); | ||
669 | p = xdr_decode_specdata3(p, &fattr->rdev); | ||
670 | |||
671 | p = xdr_decode_hyper(p, &fattr->fsid.major); | ||
672 | fattr->fsid.minor = 0; | ||
673 | |||
674 | p = xdr_decode_fileid3(p, &fattr->fileid); | ||
675 | p = xdr_decode_nfstime3(p, &fattr->atime); | ||
676 | p = xdr_decode_nfstime3(p, &fattr->mtime); | ||
677 | xdr_decode_nfstime3(p, &fattr->ctime); | ||
678 | |||
679 | fattr->valid |= NFS_ATTR_FATTR_V3; | ||
402 | return 0; | 680 | return 0; |
681 | out_overflow: | ||
682 | print_overflow_msg(__func__, xdr); | ||
683 | return -EIO; | ||
403 | } | 684 | } |
404 | 685 | ||
405 | /* | 686 | /* |
406 | * Encode SYMLINK arguments | 687 | * post_op_attr |
688 | * | ||
689 | * union post_op_attr switch (bool attributes_follow) { | ||
690 | * case TRUE: | ||
691 | * fattr3 attributes; | ||
692 | * case FALSE: | ||
693 | * void; | ||
694 | * }; | ||
407 | */ | 695 | */ |
408 | static int | 696 | static int decode_post_op_attr(struct xdr_stream *xdr, struct nfs_fattr *fattr) |
409 | nfs3_xdr_symlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_symlinkargs *args) | ||
410 | { | 697 | { |
411 | p = xdr_encode_fhandle(p, args->fromfh); | 698 | __be32 *p; |
412 | p = xdr_encode_array(p, args->fromname, args->fromlen); | ||
413 | p = xdr_encode_sattr(p, args->sattr); | ||
414 | *p++ = htonl(args->pathlen); | ||
415 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
416 | 699 | ||
417 | /* Copy the page */ | 700 | p = xdr_inline_decode(xdr, 4); |
418 | xdr_encode_pages(&req->rq_snd_buf, args->pages, 0, args->pathlen); | 701 | if (unlikely(p == NULL)) |
702 | goto out_overflow; | ||
703 | if (*p != xdr_zero) | ||
704 | return decode_fattr3(xdr, fattr); | ||
419 | return 0; | 705 | return 0; |
706 | out_overflow: | ||
707 | print_overflow_msg(__func__, xdr); | ||
708 | return -EIO; | ||
420 | } | 709 | } |
421 | 710 | ||
422 | /* | 711 | /* |
423 | * Encode MKNOD arguments | 712 | * wcc_attr |
713 | * struct wcc_attr { | ||
714 | * size3 size; | ||
715 | * nfstime3 mtime; | ||
716 | * nfstime3 ctime; | ||
717 | * }; | ||
424 | */ | 718 | */ |
425 | static int | 719 | static int decode_wcc_attr(struct xdr_stream *xdr, struct nfs_fattr *fattr) |
426 | nfs3_xdr_mknodargs(struct rpc_rqst *req, __be32 *p, struct nfs3_mknodargs *args) | 720 | { |
427 | { | 721 | __be32 *p; |
428 | p = xdr_encode_fhandle(p, args->fh); | 722 | |
429 | p = xdr_encode_array(p, args->name, args->len); | 723 | p = xdr_inline_decode(xdr, NFS3_wcc_attr_sz << 2); |
430 | *p++ = htonl(args->type); | 724 | if (unlikely(p == NULL)) |
431 | p = xdr_encode_sattr(p, args->sattr); | 725 | goto out_overflow; |
432 | if (args->type == NF3CHR || args->type == NF3BLK) { | 726 | |
433 | *p++ = htonl(MAJOR(args->rdev)); | 727 | fattr->valid |= NFS_ATTR_FATTR_PRESIZE |
434 | *p++ = htonl(MINOR(args->rdev)); | 728 | | NFS_ATTR_FATTR_PREMTIME |
435 | } | 729 | | NFS_ATTR_FATTR_PRECTIME; |
730 | |||
731 | p = xdr_decode_size3(p, &fattr->pre_size); | ||
732 | p = xdr_decode_nfstime3(p, &fattr->pre_mtime); | ||
733 | xdr_decode_nfstime3(p, &fattr->pre_ctime); | ||
436 | 734 | ||
437 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
438 | return 0; | 735 | return 0; |
736 | out_overflow: | ||
737 | print_overflow_msg(__func__, xdr); | ||
738 | return -EIO; | ||
439 | } | 739 | } |
440 | 740 | ||
441 | /* | 741 | /* |
442 | * Encode RENAME arguments | 742 | * pre_op_attr |
743 | * union pre_op_attr switch (bool attributes_follow) { | ||
744 | * case TRUE: | ||
745 | * wcc_attr attributes; | ||
746 | * case FALSE: | ||
747 | * void; | ||
748 | * }; | ||
749 | * | ||
750 | * wcc_data | ||
751 | * | ||
752 | * struct wcc_data { | ||
753 | * pre_op_attr before; | ||
754 | * post_op_attr after; | ||
755 | * }; | ||
443 | */ | 756 | */ |
444 | static int | 757 | static int decode_pre_op_attr(struct xdr_stream *xdr, struct nfs_fattr *fattr) |
445 | nfs3_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs3_renameargs *args) | 758 | { |
446 | { | 759 | __be32 *p; |
447 | p = xdr_encode_fhandle(p, args->fromfh); | 760 | |
448 | p = xdr_encode_array(p, args->fromname, args->fromlen); | 761 | p = xdr_inline_decode(xdr, 4); |
449 | p = xdr_encode_fhandle(p, args->tofh); | 762 | if (unlikely(p == NULL)) |
450 | p = xdr_encode_array(p, args->toname, args->tolen); | 763 | goto out_overflow; |
451 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 764 | if (*p != xdr_zero) |
765 | return decode_wcc_attr(xdr, fattr); | ||
452 | return 0; | 766 | return 0; |
767 | out_overflow: | ||
768 | print_overflow_msg(__func__, xdr); | ||
769 | return -EIO; | ||
453 | } | 770 | } |
454 | 771 | ||
455 | /* | 772 | static int decode_wcc_data(struct xdr_stream *xdr, struct nfs_fattr *fattr) |
456 | * Encode LINK arguments | ||
457 | */ | ||
458 | static int | ||
459 | nfs3_xdr_linkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_linkargs *args) | ||
460 | { | 773 | { |
461 | p = xdr_encode_fhandle(p, args->fromfh); | 774 | int error; |
462 | p = xdr_encode_fhandle(p, args->tofh); | 775 | |
463 | p = xdr_encode_array(p, args->toname, args->tolen); | 776 | error = decode_pre_op_attr(xdr, fattr); |
464 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 777 | if (unlikely(error)) |
465 | return 0; | 778 | goto out; |
779 | error = decode_post_op_attr(xdr, fattr); | ||
780 | out: | ||
781 | return error; | ||
466 | } | 782 | } |
467 | 783 | ||
468 | /* | 784 | /* |
469 | * Encode arguments to readdir call | 785 | * post_op_fh3 |
786 | * | ||
787 | * union post_op_fh3 switch (bool handle_follows) { | ||
788 | * case TRUE: | ||
789 | * nfs_fh3 handle; | ||
790 | * case FALSE: | ||
791 | * void; | ||
792 | * }; | ||
470 | */ | 793 | */ |
471 | static int | 794 | static int decode_post_op_fh3(struct xdr_stream *xdr, struct nfs_fh *fh) |
472 | nfs3_xdr_readdirargs(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirargs *args) | ||
473 | { | 795 | { |
474 | struct rpc_auth *auth = req->rq_cred->cr_auth; | 796 | __be32 *p = xdr_inline_decode(xdr, 4); |
475 | unsigned int replen; | 797 | if (unlikely(p == NULL)) |
476 | u32 count = args->count; | 798 | goto out_overflow; |
477 | 799 | if (*p != xdr_zero) | |
478 | p = xdr_encode_fhandle(p, args->fh); | 800 | return decode_nfs_fh3(xdr, fh); |
479 | p = xdr_encode_hyper(p, args->cookie); | 801 | zero_nfs_fh3(fh); |
480 | *p++ = args->verf[0]; | ||
481 | *p++ = args->verf[1]; | ||
482 | if (args->plus) { | ||
483 | /* readdirplus: need dircount + buffer size. | ||
484 | * We just make sure we make dircount big enough */ | ||
485 | *p++ = htonl(count >> 3); | ||
486 | } | ||
487 | *p++ = htonl(count); | ||
488 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
489 | |||
490 | /* Inline the page array */ | ||
491 | replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS3_readdirres_sz) << 2; | ||
492 | xdr_inline_pages(&req->rq_rcv_buf, replen, args->pages, 0, count); | ||
493 | return 0; | 802 | return 0; |
803 | out_overflow: | ||
804 | print_overflow_msg(__func__, xdr); | ||
805 | return -EIO; | ||
494 | } | 806 | } |
495 | 807 | ||
496 | /* | 808 | /* |
497 | * Decode the result of a readdir call. | 809 | * diropargs3 |
498 | * We just check for syntactical correctness. | 810 | * |
811 | * struct diropargs3 { | ||
812 | * nfs_fh3 dir; | ||
813 | * filename3 name; | ||
814 | * }; | ||
499 | */ | 815 | */ |
500 | static int | 816 | static void encode_diropargs3(struct xdr_stream *xdr, const struct nfs_fh *fh, |
501 | nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res) | 817 | const char *name, u32 length) |
502 | { | 818 | { |
503 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 819 | encode_nfs_fh3(xdr, fh); |
504 | struct kvec *iov = rcvbuf->head; | 820 | encode_filename3(xdr, name, length); |
505 | struct page **page; | 821 | } |
506 | size_t hdrlen; | ||
507 | u32 len, recvd, pglen; | ||
508 | int status, nr = 0; | ||
509 | __be32 *entry, *end, *kaddr; | ||
510 | |||
511 | status = ntohl(*p++); | ||
512 | /* Decode post_op_attrs */ | ||
513 | p = xdr_decode_post_op_attr(p, res->dir_attr); | ||
514 | if (status) | ||
515 | return nfs_stat_to_errno(status); | ||
516 | /* Decode verifier cookie */ | ||
517 | if (res->verf) { | ||
518 | res->verf[0] = *p++; | ||
519 | res->verf[1] = *p++; | ||
520 | } else { | ||
521 | p += 2; | ||
522 | } | ||
523 | |||
524 | hdrlen = (u8 *) p - (u8 *) iov->iov_base; | ||
525 | if (iov->iov_len < hdrlen) { | ||
526 | dprintk("NFS: READDIR reply header overflowed:" | ||
527 | "length %Zu > %Zu\n", hdrlen, iov->iov_len); | ||
528 | return -errno_NFSERR_IO; | ||
529 | } else if (iov->iov_len != hdrlen) { | ||
530 | dprintk("NFS: READDIR header is short. iovec will be shifted.\n"); | ||
531 | xdr_shift_buf(rcvbuf, iov->iov_len - hdrlen); | ||
532 | } | ||
533 | 822 | ||
534 | pglen = rcvbuf->page_len; | ||
535 | recvd = rcvbuf->len - hdrlen; | ||
536 | if (pglen > recvd) | ||
537 | pglen = recvd; | ||
538 | page = rcvbuf->pages; | ||
539 | kaddr = p = kmap_atomic(*page, KM_USER0); | ||
540 | end = (__be32 *)((char *)p + pglen); | ||
541 | entry = p; | ||
542 | |||
543 | /* Make sure the packet actually has a value_follows and EOF entry */ | ||
544 | if ((entry + 1) > end) | ||
545 | goto short_pkt; | ||
546 | |||
547 | for (; *p++; nr++) { | ||
548 | if (p + 3 > end) | ||
549 | goto short_pkt; | ||
550 | p += 2; /* inode # */ | ||
551 | len = ntohl(*p++); /* string length */ | ||
552 | p += XDR_QUADLEN(len) + 2; /* name + cookie */ | ||
553 | if (len > NFS3_MAXNAMLEN) { | ||
554 | dprintk("NFS: giant filename in readdir (len 0x%x)!\n", | ||
555 | len); | ||
556 | goto err_unmap; | ||
557 | } | ||
558 | |||
559 | if (res->plus) { | ||
560 | /* post_op_attr */ | ||
561 | if (p + 2 > end) | ||
562 | goto short_pkt; | ||
563 | if (*p++) { | ||
564 | p += 21; | ||
565 | if (p + 1 > end) | ||
566 | goto short_pkt; | ||
567 | } | ||
568 | /* post_op_fh3 */ | ||
569 | if (*p++) { | ||
570 | if (p + 1 > end) | ||
571 | goto short_pkt; | ||
572 | len = ntohl(*p++); | ||
573 | if (len > NFS3_FHSIZE) { | ||
574 | dprintk("NFS: giant filehandle in " | ||
575 | "readdir (len 0x%x)!\n", len); | ||
576 | goto err_unmap; | ||
577 | } | ||
578 | p += XDR_QUADLEN(len); | ||
579 | } | ||
580 | } | ||
581 | 823 | ||
582 | if (p + 2 > end) | 824 | /* |
583 | goto short_pkt; | 825 | * NFSv3 XDR encode functions |
584 | entry = p; | 826 | * |
585 | } | 827 | * NFSv3 argument types are defined in section 3.3 of RFC 1813: |
828 | * "NFS Version 3 Protocol Specification". | ||
829 | */ | ||
586 | 830 | ||
587 | /* | 831 | /* |
588 | * Apparently some server sends responses that are a valid size, but | 832 | * 3.3.1 GETATTR3args |
589 | * contain no entries, and have value_follows==0 and EOF==0. For | 833 | * |
590 | * those, just set the EOF marker. | 834 | * struct GETATTR3args { |
591 | */ | 835 | * nfs_fh3 object; |
592 | if (!nr && entry[1] == 0) { | 836 | * }; |
593 | dprintk("NFS: readdir reply truncated!\n"); | 837 | */ |
594 | entry[1] = 1; | 838 | static void nfs3_xdr_enc_getattr3args(struct rpc_rqst *req, |
595 | } | 839 | struct xdr_stream *xdr, |
596 | out: | 840 | const struct nfs_fh *fh) |
597 | kunmap_atomic(kaddr, KM_USER0); | 841 | { |
598 | return nr; | 842 | encode_nfs_fh3(xdr, fh); |
599 | short_pkt: | ||
600 | /* | ||
601 | * When we get a short packet there are 2 possibilities. We can | ||
602 | * return an error, or fix up the response to look like a valid | ||
603 | * response and return what we have so far. If there are no | ||
604 | * entries and the packet was short, then return -EIO. If there | ||
605 | * are valid entries in the response, return them and pretend that | ||
606 | * the call was successful, but incomplete. The caller can retry the | ||
607 | * readdir starting at the last cookie. | ||
608 | */ | ||
609 | entry[0] = entry[1] = 0; | ||
610 | if (!nr) | ||
611 | nr = -errno_NFSERR_IO; | ||
612 | goto out; | ||
613 | err_unmap: | ||
614 | nr = -errno_NFSERR_IO; | ||
615 | goto out; | ||
616 | } | 843 | } |
617 | 844 | ||
618 | __be32 * | 845 | /* |
619 | nfs3_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus) | 846 | * 3.3.2 SETATTR3args |
847 | * | ||
848 | * union sattrguard3 switch (bool check) { | ||
849 | * case TRUE: | ||
850 | * nfstime3 obj_ctime; | ||
851 | * case FALSE: | ||
852 | * void; | ||
853 | * }; | ||
854 | * | ||
855 | * struct SETATTR3args { | ||
856 | * nfs_fh3 object; | ||
857 | * sattr3 new_attributes; | ||
858 | * sattrguard3 guard; | ||
859 | * }; | ||
860 | */ | ||
861 | static void encode_sattrguard3(struct xdr_stream *xdr, | ||
862 | const struct nfs3_sattrargs *args) | ||
620 | { | 863 | { |
621 | struct nfs_entry old = *entry; | 864 | __be32 *p; |
622 | |||
623 | if (!*p++) { | ||
624 | if (!*p) | ||
625 | return ERR_PTR(-EAGAIN); | ||
626 | entry->eof = 1; | ||
627 | return ERR_PTR(-EBADCOOKIE); | ||
628 | } | ||
629 | |||
630 | p = xdr_decode_hyper(p, &entry->ino); | ||
631 | entry->len = ntohl(*p++); | ||
632 | entry->name = (const char *) p; | ||
633 | p += XDR_QUADLEN(entry->len); | ||
634 | entry->prev_cookie = entry->cookie; | ||
635 | p = xdr_decode_hyper(p, &entry->cookie); | ||
636 | 865 | ||
637 | if (plus) { | 866 | if (args->guard) { |
638 | entry->fattr->valid = 0; | 867 | p = xdr_reserve_space(xdr, 4 + 8); |
639 | p = xdr_decode_post_op_attr(p, entry->fattr); | 868 | *p++ = xdr_one; |
640 | /* In fact, a post_op_fh3: */ | 869 | xdr_encode_nfstime3(p, &args->guardtime); |
641 | if (*p++) { | 870 | } else { |
642 | p = xdr_decode_fhandle(p, entry->fh); | 871 | p = xdr_reserve_space(xdr, 4); |
643 | /* Ugh -- server reply was truncated */ | 872 | *p = xdr_zero; |
644 | if (p == NULL) { | ||
645 | dprintk("NFS: FH truncated\n"); | ||
646 | *entry = old; | ||
647 | return ERR_PTR(-EAGAIN); | ||
648 | } | ||
649 | } else | ||
650 | memset((u8*)(entry->fh), 0, sizeof(*entry->fh)); | ||
651 | } | 873 | } |
874 | } | ||
652 | 875 | ||
653 | entry->eof = !p[0] && p[1]; | 876 | static void nfs3_xdr_enc_setattr3args(struct rpc_rqst *req, |
654 | return p; | 877 | struct xdr_stream *xdr, |
878 | const struct nfs3_sattrargs *args) | ||
879 | { | ||
880 | encode_nfs_fh3(xdr, args->fh); | ||
881 | encode_sattr3(xdr, args->sattr); | ||
882 | encode_sattrguard3(xdr, args); | ||
655 | } | 883 | } |
656 | 884 | ||
657 | /* | 885 | /* |
658 | * Encode COMMIT arguments | 886 | * 3.3.3 LOOKUP3args |
887 | * | ||
888 | * struct LOOKUP3args { | ||
889 | * diropargs3 what; | ||
890 | * }; | ||
659 | */ | 891 | */ |
660 | static int | 892 | static void nfs3_xdr_enc_lookup3args(struct rpc_rqst *req, |
661 | nfs3_xdr_commitargs(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) | 893 | struct xdr_stream *xdr, |
894 | const struct nfs3_diropargs *args) | ||
662 | { | 895 | { |
663 | p = xdr_encode_fhandle(p, args->fh); | 896 | encode_diropargs3(xdr, args->fh, args->name, args->len); |
664 | p = xdr_encode_hyper(p, args->offset); | ||
665 | *p++ = htonl(args->count); | ||
666 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
667 | return 0; | ||
668 | } | 897 | } |
669 | 898 | ||
670 | #ifdef CONFIG_NFS_V3_ACL | ||
671 | /* | 899 | /* |
672 | * Encode GETACL arguments | 900 | * 3.3.4 ACCESS3args |
901 | * | ||
902 | * struct ACCESS3args { | ||
903 | * nfs_fh3 object; | ||
904 | * uint32 access; | ||
905 | * }; | ||
673 | */ | 906 | */ |
674 | static int | 907 | static void encode_access3args(struct xdr_stream *xdr, |
675 | nfs3_xdr_getaclargs(struct rpc_rqst *req, __be32 *p, | 908 | const struct nfs3_accessargs *args) |
676 | struct nfs3_getaclargs *args) | ||
677 | { | 909 | { |
678 | struct rpc_auth *auth = req->rq_cred->cr_auth; | 910 | encode_nfs_fh3(xdr, args->fh); |
679 | unsigned int replen; | 911 | encode_uint32(xdr, args->access); |
912 | } | ||
680 | 913 | ||
681 | p = xdr_encode_fhandle(p, args->fh); | 914 | static void nfs3_xdr_enc_access3args(struct rpc_rqst *req, |
682 | *p++ = htonl(args->mask); | 915 | struct xdr_stream *xdr, |
683 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 916 | const struct nfs3_accessargs *args) |
917 | { | ||
918 | encode_access3args(xdr, args); | ||
919 | } | ||
684 | 920 | ||
685 | if (args->mask & (NFS_ACL | NFS_DFACL)) { | 921 | /* |
686 | /* Inline the page array */ | 922 | * 3.3.5 READLINK3args |
687 | replen = (RPC_REPHDRSIZE + auth->au_rslack + | 923 | * |
688 | ACL3_getaclres_sz) << 2; | 924 | * struct READLINK3args { |
689 | xdr_inline_pages(&req->rq_rcv_buf, replen, args->pages, 0, | 925 | * nfs_fh3 symlink; |
690 | NFSACL_MAXPAGES << PAGE_SHIFT); | 926 | * }; |
691 | } | 927 | */ |
692 | return 0; | 928 | static void nfs3_xdr_enc_readlink3args(struct rpc_rqst *req, |
929 | struct xdr_stream *xdr, | ||
930 | const struct nfs3_readlinkargs *args) | ||
931 | { | ||
932 | encode_nfs_fh3(xdr, args->fh); | ||
933 | prepare_reply_buffer(req, args->pages, args->pgbase, | ||
934 | args->pglen, NFS3_readlinkres_sz); | ||
693 | } | 935 | } |
694 | 936 | ||
695 | /* | 937 | /* |
696 | * Encode SETACL arguments | 938 | * 3.3.6 READ3args |
939 | * | ||
940 | * struct READ3args { | ||
941 | * nfs_fh3 file; | ||
942 | * offset3 offset; | ||
943 | * count3 count; | ||
944 | * }; | ||
697 | */ | 945 | */ |
698 | static int | 946 | static void encode_read3args(struct xdr_stream *xdr, |
699 | nfs3_xdr_setaclargs(struct rpc_rqst *req, __be32 *p, | 947 | const struct nfs_readargs *args) |
700 | struct nfs3_setaclargs *args) | ||
701 | { | 948 | { |
702 | struct xdr_buf *buf = &req->rq_snd_buf; | 949 | __be32 *p; |
703 | unsigned int base; | ||
704 | int err; | ||
705 | 950 | ||
706 | p = xdr_encode_fhandle(p, NFS_FH(args->inode)); | 951 | encode_nfs_fh3(xdr, args->fh); |
707 | *p++ = htonl(args->mask); | ||
708 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
709 | base = req->rq_slen; | ||
710 | 952 | ||
711 | if (args->npages != 0) | 953 | p = xdr_reserve_space(xdr, 8 + 4); |
712 | xdr_encode_pages(buf, args->pages, 0, args->len); | 954 | p = xdr_encode_hyper(p, args->offset); |
713 | else | 955 | *p = cpu_to_be32(args->count); |
714 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, | 956 | } |
715 | p + XDR_QUADLEN(args->len)); | ||
716 | 957 | ||
717 | err = nfsacl_encode(buf, base, args->inode, | 958 | static void nfs3_xdr_enc_read3args(struct rpc_rqst *req, |
718 | (args->mask & NFS_ACL) ? | 959 | struct xdr_stream *xdr, |
719 | args->acl_access : NULL, 1, 0); | 960 | const struct nfs_readargs *args) |
720 | if (err > 0) | 961 | { |
721 | err = nfsacl_encode(buf, base + err, args->inode, | 962 | encode_read3args(xdr, args); |
722 | (args->mask & NFS_DFACL) ? | 963 | prepare_reply_buffer(req, args->pages, args->pgbase, |
723 | args->acl_default : NULL, 1, | 964 | args->count, NFS3_readres_sz); |
724 | NFS_ACL_DEFAULT); | 965 | req->rq_rcv_buf.flags |= XDRBUF_READ; |
725 | return (err > 0) ? 0 : err; | ||
726 | } | 966 | } |
727 | #endif /* CONFIG_NFS_V3_ACL */ | ||
728 | 967 | ||
729 | /* | 968 | /* |
730 | * NFS XDR decode functions | 969 | * 3.3.7 WRITE3args |
970 | * | ||
971 | * enum stable_how { | ||
972 | * UNSTABLE = 0, | ||
973 | * DATA_SYNC = 1, | ||
974 | * FILE_SYNC = 2 | ||
975 | * }; | ||
976 | * | ||
977 | * struct WRITE3args { | ||
978 | * nfs_fh3 file; | ||
979 | * offset3 offset; | ||
980 | * count3 count; | ||
981 | * stable_how stable; | ||
982 | * opaque data<>; | ||
983 | * }; | ||
731 | */ | 984 | */ |
985 | static void encode_write3args(struct xdr_stream *xdr, | ||
986 | const struct nfs_writeargs *args) | ||
987 | { | ||
988 | __be32 *p; | ||
989 | |||
990 | encode_nfs_fh3(xdr, args->fh); | ||
991 | |||
992 | p = xdr_reserve_space(xdr, 8 + 4 + 4 + 4); | ||
993 | p = xdr_encode_hyper(p, args->offset); | ||
994 | *p++ = cpu_to_be32(args->count); | ||
995 | *p++ = cpu_to_be32(args->stable); | ||
996 | *p = cpu_to_be32(args->count); | ||
997 | xdr_write_pages(xdr, args->pages, args->pgbase, args->count); | ||
998 | } | ||
999 | |||
1000 | static void nfs3_xdr_enc_write3args(struct rpc_rqst *req, | ||
1001 | struct xdr_stream *xdr, | ||
1002 | const struct nfs_writeargs *args) | ||
1003 | { | ||
1004 | encode_write3args(xdr, args); | ||
1005 | xdr->buf->flags |= XDRBUF_WRITE; | ||
1006 | } | ||
732 | 1007 | ||
733 | /* | 1008 | /* |
734 | * Decode attrstat reply. | 1009 | * 3.3.8 CREATE3args |
1010 | * | ||
1011 | * enum createmode3 { | ||
1012 | * UNCHECKED = 0, | ||
1013 | * GUARDED = 1, | ||
1014 | * EXCLUSIVE = 2 | ||
1015 | * }; | ||
1016 | * | ||
1017 | * union createhow3 switch (createmode3 mode) { | ||
1018 | * case UNCHECKED: | ||
1019 | * case GUARDED: | ||
1020 | * sattr3 obj_attributes; | ||
1021 | * case EXCLUSIVE: | ||
1022 | * createverf3 verf; | ||
1023 | * }; | ||
1024 | * | ||
1025 | * struct CREATE3args { | ||
1026 | * diropargs3 where; | ||
1027 | * createhow3 how; | ||
1028 | * }; | ||
735 | */ | 1029 | */ |
736 | static int | 1030 | static void encode_createhow3(struct xdr_stream *xdr, |
737 | nfs3_xdr_attrstat(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) | 1031 | const struct nfs3_createargs *args) |
738 | { | 1032 | { |
739 | int status; | 1033 | encode_uint32(xdr, args->createmode); |
1034 | switch (args->createmode) { | ||
1035 | case NFS3_CREATE_UNCHECKED: | ||
1036 | case NFS3_CREATE_GUARDED: | ||
1037 | encode_sattr3(xdr, args->sattr); | ||
1038 | break; | ||
1039 | case NFS3_CREATE_EXCLUSIVE: | ||
1040 | encode_createverf3(xdr, args->verifier); | ||
1041 | break; | ||
1042 | default: | ||
1043 | BUG(); | ||
1044 | } | ||
1045 | } | ||
740 | 1046 | ||
741 | if ((status = ntohl(*p++))) | 1047 | static void nfs3_xdr_enc_create3args(struct rpc_rqst *req, |
742 | return nfs_stat_to_errno(status); | 1048 | struct xdr_stream *xdr, |
743 | xdr_decode_fattr(p, fattr); | 1049 | const struct nfs3_createargs *args) |
744 | return 0; | 1050 | { |
1051 | encode_diropargs3(xdr, args->fh, args->name, args->len); | ||
1052 | encode_createhow3(xdr, args); | ||
745 | } | 1053 | } |
746 | 1054 | ||
747 | /* | 1055 | /* |
748 | * Decode status+wcc_data reply | 1056 | * 3.3.9 MKDIR3args |
749 | * SATTR, REMOVE, RMDIR | 1057 | * |
1058 | * struct MKDIR3args { | ||
1059 | * diropargs3 where; | ||
1060 | * sattr3 attributes; | ||
1061 | * }; | ||
750 | */ | 1062 | */ |
751 | static int | 1063 | static void nfs3_xdr_enc_mkdir3args(struct rpc_rqst *req, |
752 | nfs3_xdr_wccstat(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) | 1064 | struct xdr_stream *xdr, |
1065 | const struct nfs3_mkdirargs *args) | ||
753 | { | 1066 | { |
754 | int status; | 1067 | encode_diropargs3(xdr, args->fh, args->name, args->len); |
1068 | encode_sattr3(xdr, args->sattr); | ||
1069 | } | ||
755 | 1070 | ||
756 | if ((status = ntohl(*p++))) | 1071 | /* |
757 | status = nfs_stat_to_errno(status); | 1072 | * 3.3.10 SYMLINK3args |
758 | xdr_decode_wcc_data(p, fattr); | 1073 | * |
759 | return status; | 1074 | * struct symlinkdata3 { |
1075 | * sattr3 symlink_attributes; | ||
1076 | * nfspath3 symlink_data; | ||
1077 | * }; | ||
1078 | * | ||
1079 | * struct SYMLINK3args { | ||
1080 | * diropargs3 where; | ||
1081 | * symlinkdata3 symlink; | ||
1082 | * }; | ||
1083 | */ | ||
1084 | static void encode_symlinkdata3(struct xdr_stream *xdr, | ||
1085 | const struct nfs3_symlinkargs *args) | ||
1086 | { | ||
1087 | encode_sattr3(xdr, args->sattr); | ||
1088 | encode_nfspath3(xdr, args->pages, args->pathlen); | ||
760 | } | 1089 | } |
761 | 1090 | ||
762 | static int | 1091 | static void nfs3_xdr_enc_symlink3args(struct rpc_rqst *req, |
763 | nfs3_xdr_removeres(struct rpc_rqst *req, __be32 *p, struct nfs_removeres *res) | 1092 | struct xdr_stream *xdr, |
1093 | const struct nfs3_symlinkargs *args) | ||
764 | { | 1094 | { |
765 | return nfs3_xdr_wccstat(req, p, res->dir_attr); | 1095 | encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen); |
1096 | encode_symlinkdata3(xdr, args); | ||
766 | } | 1097 | } |
767 | 1098 | ||
768 | /* | 1099 | /* |
769 | * Decode LOOKUP reply | 1100 | * 3.3.11 MKNOD3args |
1101 | * | ||
1102 | * struct devicedata3 { | ||
1103 | * sattr3 dev_attributes; | ||
1104 | * specdata3 spec; | ||
1105 | * }; | ||
1106 | * | ||
1107 | * union mknoddata3 switch (ftype3 type) { | ||
1108 | * case NF3CHR: | ||
1109 | * case NF3BLK: | ||
1110 | * devicedata3 device; | ||
1111 | * case NF3SOCK: | ||
1112 | * case NF3FIFO: | ||
1113 | * sattr3 pipe_attributes; | ||
1114 | * default: | ||
1115 | * void; | ||
1116 | * }; | ||
1117 | * | ||
1118 | * struct MKNOD3args { | ||
1119 | * diropargs3 where; | ||
1120 | * mknoddata3 what; | ||
1121 | * }; | ||
770 | */ | 1122 | */ |
771 | static int | 1123 | static void encode_devicedata3(struct xdr_stream *xdr, |
772 | nfs3_xdr_lookupres(struct rpc_rqst *req, __be32 *p, struct nfs3_diropres *res) | 1124 | const struct nfs3_mknodargs *args) |
773 | { | 1125 | { |
774 | int status; | 1126 | encode_sattr3(xdr, args->sattr); |
1127 | encode_specdata3(xdr, args->rdev); | ||
1128 | } | ||
775 | 1129 | ||
776 | if ((status = ntohl(*p++))) { | 1130 | static void encode_mknoddata3(struct xdr_stream *xdr, |
777 | status = nfs_stat_to_errno(status); | 1131 | const struct nfs3_mknodargs *args) |
778 | } else { | 1132 | { |
779 | if (!(p = xdr_decode_fhandle(p, res->fh))) | 1133 | encode_ftype3(xdr, args->type); |
780 | return -errno_NFSERR_IO; | 1134 | switch (args->type) { |
781 | p = xdr_decode_post_op_attr(p, res->fattr); | 1135 | case NF3CHR: |
1136 | case NF3BLK: | ||
1137 | encode_devicedata3(xdr, args); | ||
1138 | break; | ||
1139 | case NF3SOCK: | ||
1140 | case NF3FIFO: | ||
1141 | encode_sattr3(xdr, args->sattr); | ||
1142 | break; | ||
1143 | case NF3REG: | ||
1144 | case NF3DIR: | ||
1145 | break; | ||
1146 | default: | ||
1147 | BUG(); | ||
782 | } | 1148 | } |
783 | xdr_decode_post_op_attr(p, res->dir_attr); | 1149 | } |
784 | return status; | 1150 | |
1151 | static void nfs3_xdr_enc_mknod3args(struct rpc_rqst *req, | ||
1152 | struct xdr_stream *xdr, | ||
1153 | const struct nfs3_mknodargs *args) | ||
1154 | { | ||
1155 | encode_diropargs3(xdr, args->fh, args->name, args->len); | ||
1156 | encode_mknoddata3(xdr, args); | ||
785 | } | 1157 | } |
786 | 1158 | ||
787 | /* | 1159 | /* |
788 | * Decode ACCESS reply | 1160 | * 3.3.12 REMOVE3args |
1161 | * | ||
1162 | * struct REMOVE3args { | ||
1163 | * diropargs3 object; | ||
1164 | * }; | ||
789 | */ | 1165 | */ |
790 | static int | 1166 | static void nfs3_xdr_enc_remove3args(struct rpc_rqst *req, |
791 | nfs3_xdr_accessres(struct rpc_rqst *req, __be32 *p, struct nfs3_accessres *res) | 1167 | struct xdr_stream *xdr, |
1168 | const struct nfs_removeargs *args) | ||
792 | { | 1169 | { |
793 | int status = ntohl(*p++); | 1170 | encode_diropargs3(xdr, args->fh, args->name.name, args->name.len); |
1171 | } | ||
794 | 1172 | ||
795 | p = xdr_decode_post_op_attr(p, res->fattr); | 1173 | /* |
796 | if (status) | 1174 | * 3.3.14 RENAME3args |
797 | return nfs_stat_to_errno(status); | 1175 | * |
798 | res->access = ntohl(*p++); | 1176 | * struct RENAME3args { |
799 | return 0; | 1177 | * diropargs3 from; |
1178 | * diropargs3 to; | ||
1179 | * }; | ||
1180 | */ | ||
1181 | static void nfs3_xdr_enc_rename3args(struct rpc_rqst *req, | ||
1182 | struct xdr_stream *xdr, | ||
1183 | const struct nfs_renameargs *args) | ||
1184 | { | ||
1185 | const struct qstr *old = args->old_name; | ||
1186 | const struct qstr *new = args->new_name; | ||
1187 | |||
1188 | encode_diropargs3(xdr, args->old_dir, old->name, old->len); | ||
1189 | encode_diropargs3(xdr, args->new_dir, new->name, new->len); | ||
800 | } | 1190 | } |
801 | 1191 | ||
802 | static int | 1192 | /* |
803 | nfs3_xdr_readlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_readlinkargs *args) | 1193 | * 3.3.15 LINK3args |
1194 | * | ||
1195 | * struct LINK3args { | ||
1196 | * nfs_fh3 file; | ||
1197 | * diropargs3 link; | ||
1198 | * }; | ||
1199 | */ | ||
1200 | static void nfs3_xdr_enc_link3args(struct rpc_rqst *req, | ||
1201 | struct xdr_stream *xdr, | ||
1202 | const struct nfs3_linkargs *args) | ||
804 | { | 1203 | { |
805 | struct rpc_auth *auth = req->rq_cred->cr_auth; | 1204 | encode_nfs_fh3(xdr, args->fromfh); |
806 | unsigned int replen; | 1205 | encode_diropargs3(xdr, args->tofh, args->toname, args->tolen); |
1206 | } | ||
807 | 1207 | ||
808 | p = xdr_encode_fhandle(p, args->fh); | 1208 | /* |
809 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 1209 | * 3.3.16 READDIR3args |
1210 | * | ||
1211 | * struct READDIR3args { | ||
1212 | * nfs_fh3 dir; | ||
1213 | * cookie3 cookie; | ||
1214 | * cookieverf3 cookieverf; | ||
1215 | * count3 count; | ||
1216 | * }; | ||
1217 | */ | ||
1218 | static void encode_readdir3args(struct xdr_stream *xdr, | ||
1219 | const struct nfs3_readdirargs *args) | ||
1220 | { | ||
1221 | __be32 *p; | ||
810 | 1222 | ||
811 | /* Inline the page array */ | 1223 | encode_nfs_fh3(xdr, args->fh); |
812 | replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS3_readlinkres_sz) << 2; | 1224 | |
813 | xdr_inline_pages(&req->rq_rcv_buf, replen, args->pages, args->pgbase, args->pglen); | 1225 | p = xdr_reserve_space(xdr, 8 + NFS3_COOKIEVERFSIZE + 4); |
814 | return 0; | 1226 | p = xdr_encode_cookie3(p, args->cookie); |
1227 | p = xdr_encode_cookieverf3(p, args->verf); | ||
1228 | *p = cpu_to_be32(args->count); | ||
1229 | } | ||
1230 | |||
1231 | static void nfs3_xdr_enc_readdir3args(struct rpc_rqst *req, | ||
1232 | struct xdr_stream *xdr, | ||
1233 | const struct nfs3_readdirargs *args) | ||
1234 | { | ||
1235 | encode_readdir3args(xdr, args); | ||
1236 | prepare_reply_buffer(req, args->pages, 0, | ||
1237 | args->count, NFS3_readdirres_sz); | ||
815 | } | 1238 | } |
816 | 1239 | ||
817 | /* | 1240 | /* |
818 | * Decode READLINK reply | 1241 | * 3.3.17 READDIRPLUS3args |
1242 | * | ||
1243 | * struct READDIRPLUS3args { | ||
1244 | * nfs_fh3 dir; | ||
1245 | * cookie3 cookie; | ||
1246 | * cookieverf3 cookieverf; | ||
1247 | * count3 dircount; | ||
1248 | * count3 maxcount; | ||
1249 | * }; | ||
819 | */ | 1250 | */ |
820 | static int | 1251 | static void encode_readdirplus3args(struct xdr_stream *xdr, |
821 | nfs3_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) | 1252 | const struct nfs3_readdirargs *args) |
822 | { | 1253 | { |
823 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 1254 | __be32 *p; |
824 | struct kvec *iov = rcvbuf->head; | ||
825 | size_t hdrlen; | ||
826 | u32 len, recvd; | ||
827 | char *kaddr; | ||
828 | int status; | ||
829 | 1255 | ||
830 | status = ntohl(*p++); | 1256 | encode_nfs_fh3(xdr, args->fh); |
831 | p = xdr_decode_post_op_attr(p, fattr); | ||
832 | 1257 | ||
833 | if (status != 0) | 1258 | p = xdr_reserve_space(xdr, 8 + NFS3_COOKIEVERFSIZE + 4 + 4); |
834 | return nfs_stat_to_errno(status); | 1259 | p = xdr_encode_cookie3(p, args->cookie); |
1260 | p = xdr_encode_cookieverf3(p, args->verf); | ||
835 | 1261 | ||
836 | /* Convert length of symlink */ | 1262 | /* |
837 | len = ntohl(*p++); | 1263 | * readdirplus: need dircount + buffer size. |
838 | if (len >= rcvbuf->page_len) { | 1264 | * We just make sure we make dircount big enough |
839 | dprintk("nfs: server returned giant symlink!\n"); | 1265 | */ |
840 | return -ENAMETOOLONG; | 1266 | *p++ = cpu_to_be32(args->count >> 3); |
841 | } | ||
842 | 1267 | ||
843 | hdrlen = (u8 *) p - (u8 *) iov->iov_base; | 1268 | *p = cpu_to_be32(args->count); |
844 | if (iov->iov_len < hdrlen) { | 1269 | } |
845 | dprintk("NFS: READLINK reply header overflowed:" | ||
846 | "length %Zu > %Zu\n", hdrlen, iov->iov_len); | ||
847 | return -errno_NFSERR_IO; | ||
848 | } else if (iov->iov_len != hdrlen) { | ||
849 | dprintk("NFS: READLINK header is short. " | ||
850 | "iovec will be shifted.\n"); | ||
851 | xdr_shift_buf(rcvbuf, iov->iov_len - hdrlen); | ||
852 | } | ||
853 | recvd = req->rq_rcv_buf.len - hdrlen; | ||
854 | if (recvd < len) { | ||
855 | dprintk("NFS: server cheating in readlink reply: " | ||
856 | "count %u > recvd %u\n", len, recvd); | ||
857 | return -EIO; | ||
858 | } | ||
859 | 1270 | ||
860 | /* NULL terminate the string we got */ | 1271 | static void nfs3_xdr_enc_readdirplus3args(struct rpc_rqst *req, |
861 | kaddr = (char*)kmap_atomic(rcvbuf->pages[0], KM_USER0); | 1272 | struct xdr_stream *xdr, |
862 | kaddr[len+rcvbuf->page_base] = '\0'; | 1273 | const struct nfs3_readdirargs *args) |
863 | kunmap_atomic(kaddr, KM_USER0); | 1274 | { |
864 | return 0; | 1275 | encode_readdirplus3args(xdr, args); |
1276 | prepare_reply_buffer(req, args->pages, 0, | ||
1277 | args->count, NFS3_readdirres_sz); | ||
865 | } | 1278 | } |
866 | 1279 | ||
867 | /* | 1280 | /* |
868 | * Decode READ reply | 1281 | * 3.3.21 COMMIT3args |
1282 | * | ||
1283 | * struct COMMIT3args { | ||
1284 | * nfs_fh3 file; | ||
1285 | * offset3 offset; | ||
1286 | * count3 count; | ||
1287 | * }; | ||
869 | */ | 1288 | */ |
870 | static int | 1289 | static void encode_commit3args(struct xdr_stream *xdr, |
871 | nfs3_xdr_readres(struct rpc_rqst *req, __be32 *p, struct nfs_readres *res) | 1290 | const struct nfs_writeargs *args) |
872 | { | 1291 | { |
873 | struct kvec *iov = req->rq_rcv_buf.head; | 1292 | __be32 *p; |
874 | size_t hdrlen; | ||
875 | u32 count, ocount, recvd; | ||
876 | int status; | ||
877 | 1293 | ||
878 | status = ntohl(*p++); | 1294 | encode_nfs_fh3(xdr, args->fh); |
879 | p = xdr_decode_post_op_attr(p, res->fattr); | ||
880 | 1295 | ||
881 | if (status != 0) | 1296 | p = xdr_reserve_space(xdr, 8 + 4); |
882 | return nfs_stat_to_errno(status); | 1297 | p = xdr_encode_hyper(p, args->offset); |
1298 | *p = cpu_to_be32(args->count); | ||
1299 | } | ||
883 | 1300 | ||
884 | /* Decode reply count and EOF flag. NFSv3 is somewhat redundant | 1301 | static void nfs3_xdr_enc_commit3args(struct rpc_rqst *req, |
885 | * in that it puts the count both in the res struct and in the | 1302 | struct xdr_stream *xdr, |
886 | * opaque data count. */ | 1303 | const struct nfs_writeargs *args) |
887 | count = ntohl(*p++); | 1304 | { |
888 | res->eof = ntohl(*p++); | 1305 | encode_commit3args(xdr, args); |
889 | ocount = ntohl(*p++); | 1306 | } |
890 | 1307 | ||
891 | if (ocount != count) { | 1308 | #ifdef CONFIG_NFS_V3_ACL |
892 | dprintk("NFS: READ count doesn't match RPC opaque count.\n"); | ||
893 | return -errno_NFSERR_IO; | ||
894 | } | ||
895 | 1309 | ||
896 | hdrlen = (u8 *) p - (u8 *) iov->iov_base; | 1310 | static void nfs3_xdr_enc_getacl3args(struct rpc_rqst *req, |
897 | if (iov->iov_len < hdrlen) { | 1311 | struct xdr_stream *xdr, |
898 | dprintk("NFS: READ reply header overflowed:" | 1312 | const struct nfs3_getaclargs *args) |
899 | "length %Zu > %Zu\n", hdrlen, iov->iov_len); | 1313 | { |
900 | return -errno_NFSERR_IO; | 1314 | encode_nfs_fh3(xdr, args->fh); |
901 | } else if (iov->iov_len != hdrlen) { | 1315 | encode_uint32(xdr, args->mask); |
902 | dprintk("NFS: READ header is short. iovec will be shifted.\n"); | 1316 | if (args->mask & (NFS_ACL | NFS_DFACL)) |
903 | xdr_shift_buf(&req->rq_rcv_buf, iov->iov_len - hdrlen); | 1317 | prepare_reply_buffer(req, args->pages, 0, |
904 | } | 1318 | NFSACL_MAXPAGES << PAGE_SHIFT, |
1319 | ACL3_getaclres_sz); | ||
1320 | } | ||
905 | 1321 | ||
906 | recvd = req->rq_rcv_buf.len - hdrlen; | 1322 | static void nfs3_xdr_enc_setacl3args(struct rpc_rqst *req, |
907 | if (count > recvd) { | 1323 | struct xdr_stream *xdr, |
908 | dprintk("NFS: server cheating in read reply: " | 1324 | const struct nfs3_setaclargs *args) |
909 | "count %u > recvd %u\n", count, recvd); | 1325 | { |
910 | count = recvd; | 1326 | unsigned int base; |
911 | res->eof = 0; | 1327 | int error; |
912 | } | ||
913 | 1328 | ||
914 | if (count < res->count) | 1329 | encode_nfs_fh3(xdr, NFS_FH(args->inode)); |
915 | res->count = count; | 1330 | encode_uint32(xdr, args->mask); |
916 | 1331 | ||
917 | return count; | 1332 | base = req->rq_slen; |
1333 | if (args->npages != 0) | ||
1334 | xdr_write_pages(xdr, args->pages, 0, args->len); | ||
1335 | else | ||
1336 | xdr_reserve_space(xdr, NFS_ACL_INLINE_BUFSIZE); | ||
1337 | |||
1338 | error = nfsacl_encode(xdr->buf, base, args->inode, | ||
1339 | (args->mask & NFS_ACL) ? | ||
1340 | args->acl_access : NULL, 1, 0); | ||
1341 | BUG_ON(error < 0); | ||
1342 | error = nfsacl_encode(xdr->buf, base + error, args->inode, | ||
1343 | (args->mask & NFS_DFACL) ? | ||
1344 | args->acl_default : NULL, 1, | ||
1345 | NFS_ACL_DEFAULT); | ||
1346 | BUG_ON(error < 0); | ||
918 | } | 1347 | } |
919 | 1348 | ||
1349 | #endif /* CONFIG_NFS_V3_ACL */ | ||
1350 | |||
920 | /* | 1351 | /* |
921 | * Decode WRITE response | 1352 | * NFSv3 XDR decode functions |
1353 | * | ||
1354 | * NFSv3 result types are defined in section 3.3 of RFC 1813: | ||
1355 | * "NFS Version 3 Protocol Specification". | ||
922 | */ | 1356 | */ |
923 | static int | ||
924 | nfs3_xdr_writeres(struct rpc_rqst *req, __be32 *p, struct nfs_writeres *res) | ||
925 | { | ||
926 | int status; | ||
927 | 1357 | ||
928 | status = ntohl(*p++); | 1358 | /* |
929 | p = xdr_decode_wcc_data(p, res->fattr); | 1359 | * 3.3.1 GETATTR3res |
1360 | * | ||
1361 | * struct GETATTR3resok { | ||
1362 | * fattr3 obj_attributes; | ||
1363 | * }; | ||
1364 | * | ||
1365 | * union GETATTR3res switch (nfsstat3 status) { | ||
1366 | * case NFS3_OK: | ||
1367 | * GETATTR3resok resok; | ||
1368 | * default: | ||
1369 | * void; | ||
1370 | * }; | ||
1371 | */ | ||
1372 | static int nfs3_xdr_dec_getattr3res(struct rpc_rqst *req, | ||
1373 | struct xdr_stream *xdr, | ||
1374 | struct nfs_fattr *result) | ||
1375 | { | ||
1376 | enum nfs_stat status; | ||
1377 | int error; | ||
1378 | |||
1379 | error = decode_nfsstat3(xdr, &status); | ||
1380 | if (unlikely(error)) | ||
1381 | goto out; | ||
1382 | if (status != NFS3_OK) | ||
1383 | goto out_default; | ||
1384 | error = decode_fattr3(xdr, result); | ||
1385 | out: | ||
1386 | return error; | ||
1387 | out_default: | ||
1388 | return nfs_stat_to_errno(status); | ||
1389 | } | ||
930 | 1390 | ||
931 | if (status != 0) | 1391 | /* |
932 | return nfs_stat_to_errno(status); | 1392 | * 3.3.2 SETATTR3res |
1393 | * | ||
1394 | * struct SETATTR3resok { | ||
1395 | * wcc_data obj_wcc; | ||
1396 | * }; | ||
1397 | * | ||
1398 | * struct SETATTR3resfail { | ||
1399 | * wcc_data obj_wcc; | ||
1400 | * }; | ||
1401 | * | ||
1402 | * union SETATTR3res switch (nfsstat3 status) { | ||
1403 | * case NFS3_OK: | ||
1404 | * SETATTR3resok resok; | ||
1405 | * default: | ||
1406 | * SETATTR3resfail resfail; | ||
1407 | * }; | ||
1408 | */ | ||
1409 | static int nfs3_xdr_dec_setattr3res(struct rpc_rqst *req, | ||
1410 | struct xdr_stream *xdr, | ||
1411 | struct nfs_fattr *result) | ||
1412 | { | ||
1413 | enum nfs_stat status; | ||
1414 | int error; | ||
1415 | |||
1416 | error = decode_nfsstat3(xdr, &status); | ||
1417 | if (unlikely(error)) | ||
1418 | goto out; | ||
1419 | error = decode_wcc_data(xdr, result); | ||
1420 | if (unlikely(error)) | ||
1421 | goto out; | ||
1422 | if (status != NFS3_OK) | ||
1423 | goto out_status; | ||
1424 | out: | ||
1425 | return error; | ||
1426 | out_status: | ||
1427 | return nfs_stat_to_errno(status); | ||
1428 | } | ||
933 | 1429 | ||
934 | res->count = ntohl(*p++); | 1430 | /* |
935 | res->verf->committed = (enum nfs3_stable_how)ntohl(*p++); | 1431 | * 3.3.3 LOOKUP3res |
936 | res->verf->verifier[0] = *p++; | 1432 | * |
937 | res->verf->verifier[1] = *p++; | 1433 | * struct LOOKUP3resok { |
1434 | * nfs_fh3 object; | ||
1435 | * post_op_attr obj_attributes; | ||
1436 | * post_op_attr dir_attributes; | ||
1437 | * }; | ||
1438 | * | ||
1439 | * struct LOOKUP3resfail { | ||
1440 | * post_op_attr dir_attributes; | ||
1441 | * }; | ||
1442 | * | ||
1443 | * union LOOKUP3res switch (nfsstat3 status) { | ||
1444 | * case NFS3_OK: | ||
1445 | * LOOKUP3resok resok; | ||
1446 | * default: | ||
1447 | * LOOKUP3resfail resfail; | ||
1448 | * }; | ||
1449 | */ | ||
1450 | static int nfs3_xdr_dec_lookup3res(struct rpc_rqst *req, | ||
1451 | struct xdr_stream *xdr, | ||
1452 | struct nfs3_diropres *result) | ||
1453 | { | ||
1454 | enum nfs_stat status; | ||
1455 | int error; | ||
1456 | |||
1457 | error = decode_nfsstat3(xdr, &status); | ||
1458 | if (unlikely(error)) | ||
1459 | goto out; | ||
1460 | if (status != NFS3_OK) | ||
1461 | goto out_default; | ||
1462 | error = decode_nfs_fh3(xdr, result->fh); | ||
1463 | if (unlikely(error)) | ||
1464 | goto out; | ||
1465 | error = decode_post_op_attr(xdr, result->fattr); | ||
1466 | if (unlikely(error)) | ||
1467 | goto out; | ||
1468 | error = decode_post_op_attr(xdr, result->dir_attr); | ||
1469 | out: | ||
1470 | return error; | ||
1471 | out_default: | ||
1472 | error = decode_post_op_attr(xdr, result->dir_attr); | ||
1473 | if (unlikely(error)) | ||
1474 | goto out; | ||
1475 | return nfs_stat_to_errno(status); | ||
1476 | } | ||
938 | 1477 | ||
939 | return res->count; | 1478 | /* |
1479 | * 3.3.4 ACCESS3res | ||
1480 | * | ||
1481 | * struct ACCESS3resok { | ||
1482 | * post_op_attr obj_attributes; | ||
1483 | * uint32 access; | ||
1484 | * }; | ||
1485 | * | ||
1486 | * struct ACCESS3resfail { | ||
1487 | * post_op_attr obj_attributes; | ||
1488 | * }; | ||
1489 | * | ||
1490 | * union ACCESS3res switch (nfsstat3 status) { | ||
1491 | * case NFS3_OK: | ||
1492 | * ACCESS3resok resok; | ||
1493 | * default: | ||
1494 | * ACCESS3resfail resfail; | ||
1495 | * }; | ||
1496 | */ | ||
1497 | static int nfs3_xdr_dec_access3res(struct rpc_rqst *req, | ||
1498 | struct xdr_stream *xdr, | ||
1499 | struct nfs3_accessres *result) | ||
1500 | { | ||
1501 | enum nfs_stat status; | ||
1502 | int error; | ||
1503 | |||
1504 | error = decode_nfsstat3(xdr, &status); | ||
1505 | if (unlikely(error)) | ||
1506 | goto out; | ||
1507 | error = decode_post_op_attr(xdr, result->fattr); | ||
1508 | if (unlikely(error)) | ||
1509 | goto out; | ||
1510 | if (status != NFS3_OK) | ||
1511 | goto out_default; | ||
1512 | error = decode_uint32(xdr, &result->access); | ||
1513 | out: | ||
1514 | return error; | ||
1515 | out_default: | ||
1516 | return nfs_stat_to_errno(status); | ||
940 | } | 1517 | } |
941 | 1518 | ||
942 | /* | 1519 | /* |
943 | * Decode a CREATE response | 1520 | * 3.3.5 READLINK3res |
1521 | * | ||
1522 | * struct READLINK3resok { | ||
1523 | * post_op_attr symlink_attributes; | ||
1524 | * nfspath3 data; | ||
1525 | * }; | ||
1526 | * | ||
1527 | * struct READLINK3resfail { | ||
1528 | * post_op_attr symlink_attributes; | ||
1529 | * }; | ||
1530 | * | ||
1531 | * union READLINK3res switch (nfsstat3 status) { | ||
1532 | * case NFS3_OK: | ||
1533 | * READLINK3resok resok; | ||
1534 | * default: | ||
1535 | * READLINK3resfail resfail; | ||
1536 | * }; | ||
944 | */ | 1537 | */ |
945 | static int | 1538 | static int nfs3_xdr_dec_readlink3res(struct rpc_rqst *req, |
946 | nfs3_xdr_createres(struct rpc_rqst *req, __be32 *p, struct nfs3_diropres *res) | 1539 | struct xdr_stream *xdr, |
947 | { | 1540 | struct nfs_fattr *result) |
948 | int status; | 1541 | { |
949 | 1542 | enum nfs_stat status; | |
950 | status = ntohl(*p++); | 1543 | int error; |
951 | if (status == 0) { | 1544 | |
952 | if (*p++) { | 1545 | error = decode_nfsstat3(xdr, &status); |
953 | if (!(p = xdr_decode_fhandle(p, res->fh))) | 1546 | if (unlikely(error)) |
954 | return -errno_NFSERR_IO; | 1547 | goto out; |
955 | p = xdr_decode_post_op_attr(p, res->fattr); | 1548 | error = decode_post_op_attr(xdr, result); |
956 | } else { | 1549 | if (unlikely(error)) |
957 | memset(res->fh, 0, sizeof(*res->fh)); | 1550 | goto out; |
958 | /* Do decode post_op_attr but set it to NULL */ | 1551 | if (status != NFS3_OK) |
959 | p = xdr_decode_post_op_attr(p, res->fattr); | 1552 | goto out_default; |
960 | res->fattr->valid = 0; | 1553 | error = decode_nfspath3(xdr); |
961 | } | 1554 | out: |
962 | } else { | 1555 | return error; |
963 | status = nfs_stat_to_errno(status); | 1556 | out_default: |
964 | } | 1557 | return nfs_stat_to_errno(status); |
965 | p = xdr_decode_wcc_data(p, res->dir_attr); | ||
966 | return status; | ||
967 | } | 1558 | } |
968 | 1559 | ||
969 | /* | 1560 | /* |
970 | * Decode RENAME reply | 1561 | * 3.3.6 READ3res |
1562 | * | ||
1563 | * struct READ3resok { | ||
1564 | * post_op_attr file_attributes; | ||
1565 | * count3 count; | ||
1566 | * bool eof; | ||
1567 | * opaque data<>; | ||
1568 | * }; | ||
1569 | * | ||
1570 | * struct READ3resfail { | ||
1571 | * post_op_attr file_attributes; | ||
1572 | * }; | ||
1573 | * | ||
1574 | * union READ3res switch (nfsstat3 status) { | ||
1575 | * case NFS3_OK: | ||
1576 | * READ3resok resok; | ||
1577 | * default: | ||
1578 | * READ3resfail resfail; | ||
1579 | * }; | ||
971 | */ | 1580 | */ |
972 | static int | 1581 | static int decode_read3resok(struct xdr_stream *xdr, |
973 | nfs3_xdr_renameres(struct rpc_rqst *req, __be32 *p, struct nfs3_renameres *res) | 1582 | struct nfs_readres *result) |
974 | { | 1583 | { |
975 | int status; | 1584 | u32 eof, count, ocount, recvd; |
1585 | size_t hdrlen; | ||
1586 | __be32 *p; | ||
1587 | |||
1588 | p = xdr_inline_decode(xdr, 4 + 4 + 4); | ||
1589 | if (unlikely(p == NULL)) | ||
1590 | goto out_overflow; | ||
1591 | count = be32_to_cpup(p++); | ||
1592 | eof = be32_to_cpup(p++); | ||
1593 | ocount = be32_to_cpup(p++); | ||
1594 | if (unlikely(ocount != count)) | ||
1595 | goto out_mismatch; | ||
1596 | hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base; | ||
1597 | recvd = xdr->buf->len - hdrlen; | ||
1598 | if (unlikely(count > recvd)) | ||
1599 | goto out_cheating; | ||
1600 | |||
1601 | out: | ||
1602 | xdr_read_pages(xdr, count); | ||
1603 | result->eof = eof; | ||
1604 | result->count = count; | ||
1605 | return count; | ||
1606 | out_mismatch: | ||
1607 | dprintk("NFS: READ count doesn't match length of opaque: " | ||
1608 | "count %u != ocount %u\n", count, ocount); | ||
1609 | return -EIO; | ||
1610 | out_cheating: | ||
1611 | dprintk("NFS: server cheating in read result: " | ||
1612 | "count %u > recvd %u\n", count, recvd); | ||
1613 | count = recvd; | ||
1614 | eof = 0; | ||
1615 | goto out; | ||
1616 | out_overflow: | ||
1617 | print_overflow_msg(__func__, xdr); | ||
1618 | return -EIO; | ||
1619 | } | ||
976 | 1620 | ||
977 | if ((status = ntohl(*p++)) != 0) | 1621 | static int nfs3_xdr_dec_read3res(struct rpc_rqst *req, struct xdr_stream *xdr, |
978 | status = nfs_stat_to_errno(status); | 1622 | struct nfs_readres *result) |
979 | p = xdr_decode_wcc_data(p, res->fromattr); | 1623 | { |
980 | p = xdr_decode_wcc_data(p, res->toattr); | 1624 | enum nfs_stat status; |
981 | return status; | 1625 | int error; |
1626 | |||
1627 | error = decode_nfsstat3(xdr, &status); | ||
1628 | if (unlikely(error)) | ||
1629 | goto out; | ||
1630 | error = decode_post_op_attr(xdr, result->fattr); | ||
1631 | if (unlikely(error)) | ||
1632 | goto out; | ||
1633 | if (status != NFS3_OK) | ||
1634 | goto out_status; | ||
1635 | error = decode_read3resok(xdr, result); | ||
1636 | out: | ||
1637 | return error; | ||
1638 | out_status: | ||
1639 | return nfs_stat_to_errno(status); | ||
982 | } | 1640 | } |
983 | 1641 | ||
984 | /* | 1642 | /* |
985 | * Decode LINK reply | 1643 | * 3.3.7 WRITE3res |
1644 | * | ||
1645 | * enum stable_how { | ||
1646 | * UNSTABLE = 0, | ||
1647 | * DATA_SYNC = 1, | ||
1648 | * FILE_SYNC = 2 | ||
1649 | * }; | ||
1650 | * | ||
1651 | * struct WRITE3resok { | ||
1652 | * wcc_data file_wcc; | ||
1653 | * count3 count; | ||
1654 | * stable_how committed; | ||
1655 | * writeverf3 verf; | ||
1656 | * }; | ||
1657 | * | ||
1658 | * struct WRITE3resfail { | ||
1659 | * wcc_data file_wcc; | ||
1660 | * }; | ||
1661 | * | ||
1662 | * union WRITE3res switch (nfsstat3 status) { | ||
1663 | * case NFS3_OK: | ||
1664 | * WRITE3resok resok; | ||
1665 | * default: | ||
1666 | * WRITE3resfail resfail; | ||
1667 | * }; | ||
986 | */ | 1668 | */ |
987 | static int | 1669 | static int decode_write3resok(struct xdr_stream *xdr, |
988 | nfs3_xdr_linkres(struct rpc_rqst *req, __be32 *p, struct nfs3_linkres *res) | 1670 | struct nfs_writeres *result) |
989 | { | 1671 | { |
990 | int status; | 1672 | __be32 *p; |
1673 | |||
1674 | p = xdr_inline_decode(xdr, 4 + 4 + NFS3_WRITEVERFSIZE); | ||
1675 | if (unlikely(p == NULL)) | ||
1676 | goto out_overflow; | ||
1677 | result->count = be32_to_cpup(p++); | ||
1678 | result->verf->committed = be32_to_cpup(p++); | ||
1679 | if (unlikely(result->verf->committed > NFS_FILE_SYNC)) | ||
1680 | goto out_badvalue; | ||
1681 | memcpy(result->verf->verifier, p, NFS3_WRITEVERFSIZE); | ||
1682 | return result->count; | ||
1683 | out_badvalue: | ||
1684 | dprintk("NFS: bad stable_how value: %u\n", result->verf->committed); | ||
1685 | return -EIO; | ||
1686 | out_overflow: | ||
1687 | print_overflow_msg(__func__, xdr); | ||
1688 | return -EIO; | ||
1689 | } | ||
991 | 1690 | ||
992 | if ((status = ntohl(*p++)) != 0) | 1691 | static int nfs3_xdr_dec_write3res(struct rpc_rqst *req, struct xdr_stream *xdr, |
993 | status = nfs_stat_to_errno(status); | 1692 | struct nfs_writeres *result) |
994 | p = xdr_decode_post_op_attr(p, res->fattr); | 1693 | { |
995 | p = xdr_decode_wcc_data(p, res->dir_attr); | 1694 | enum nfs_stat status; |
996 | return status; | 1695 | int error; |
1696 | |||
1697 | error = decode_nfsstat3(xdr, &status); | ||
1698 | if (unlikely(error)) | ||
1699 | goto out; | ||
1700 | error = decode_wcc_data(xdr, result->fattr); | ||
1701 | if (unlikely(error)) | ||
1702 | goto out; | ||
1703 | if (status != NFS3_OK) | ||
1704 | goto out_status; | ||
1705 | error = decode_write3resok(xdr, result); | ||
1706 | out: | ||
1707 | return error; | ||
1708 | out_status: | ||
1709 | return nfs_stat_to_errno(status); | ||
997 | } | 1710 | } |
998 | 1711 | ||
999 | /* | 1712 | /* |
1000 | * Decode FSSTAT reply | 1713 | * 3.3.8 CREATE3res |
1714 | * | ||
1715 | * struct CREATE3resok { | ||
1716 | * post_op_fh3 obj; | ||
1717 | * post_op_attr obj_attributes; | ||
1718 | * wcc_data dir_wcc; | ||
1719 | * }; | ||
1720 | * | ||
1721 | * struct CREATE3resfail { | ||
1722 | * wcc_data dir_wcc; | ||
1723 | * }; | ||
1724 | * | ||
1725 | * union CREATE3res switch (nfsstat3 status) { | ||
1726 | * case NFS3_OK: | ||
1727 | * CREATE3resok resok; | ||
1728 | * default: | ||
1729 | * CREATE3resfail resfail; | ||
1730 | * }; | ||
1001 | */ | 1731 | */ |
1002 | static int | 1732 | static int decode_create3resok(struct xdr_stream *xdr, |
1003 | nfs3_xdr_fsstatres(struct rpc_rqst *req, __be32 *p, struct nfs_fsstat *res) | 1733 | struct nfs3_diropres *result) |
1004 | { | 1734 | { |
1005 | int status; | 1735 | int error; |
1006 | 1736 | ||
1007 | status = ntohl(*p++); | 1737 | error = decode_post_op_fh3(xdr, result->fh); |
1738 | if (unlikely(error)) | ||
1739 | goto out; | ||
1740 | error = decode_post_op_attr(xdr, result->fattr); | ||
1741 | if (unlikely(error)) | ||
1742 | goto out; | ||
1743 | /* The server isn't required to return a file handle. | ||
1744 | * If it didn't, force the client to perform a LOOKUP | ||
1745 | * to determine the correct file handle and attribute | ||
1746 | * values for the new object. */ | ||
1747 | if (result->fh->size == 0) | ||
1748 | result->fattr->valid = 0; | ||
1749 | error = decode_wcc_data(xdr, result->dir_attr); | ||
1750 | out: | ||
1751 | return error; | ||
1752 | } | ||
1008 | 1753 | ||
1009 | p = xdr_decode_post_op_attr(p, res->fattr); | 1754 | static int nfs3_xdr_dec_create3res(struct rpc_rqst *req, |
1010 | if (status != 0) | 1755 | struct xdr_stream *xdr, |
1011 | return nfs_stat_to_errno(status); | 1756 | struct nfs3_diropres *result) |
1757 | { | ||
1758 | enum nfs_stat status; | ||
1759 | int error; | ||
1760 | |||
1761 | error = decode_nfsstat3(xdr, &status); | ||
1762 | if (unlikely(error)) | ||
1763 | goto out; | ||
1764 | if (status != NFS3_OK) | ||
1765 | goto out_default; | ||
1766 | error = decode_create3resok(xdr, result); | ||
1767 | out: | ||
1768 | return error; | ||
1769 | out_default: | ||
1770 | error = decode_wcc_data(xdr, result->dir_attr); | ||
1771 | if (unlikely(error)) | ||
1772 | goto out; | ||
1773 | return nfs_stat_to_errno(status); | ||
1774 | } | ||
1012 | 1775 | ||
1013 | p = xdr_decode_hyper(p, &res->tbytes); | 1776 | /* |
1014 | p = xdr_decode_hyper(p, &res->fbytes); | 1777 | * 3.3.12 REMOVE3res |
1015 | p = xdr_decode_hyper(p, &res->abytes); | 1778 | * |
1016 | p = xdr_decode_hyper(p, &res->tfiles); | 1779 | * struct REMOVE3resok { |
1017 | p = xdr_decode_hyper(p, &res->ffiles); | 1780 | * wcc_data dir_wcc; |
1018 | p = xdr_decode_hyper(p, &res->afiles); | 1781 | * }; |
1782 | * | ||
1783 | * struct REMOVE3resfail { | ||
1784 | * wcc_data dir_wcc; | ||
1785 | * }; | ||
1786 | * | ||
1787 | * union REMOVE3res switch (nfsstat3 status) { | ||
1788 | * case NFS3_OK: | ||
1789 | * REMOVE3resok resok; | ||
1790 | * default: | ||
1791 | * REMOVE3resfail resfail; | ||
1792 | * }; | ||
1793 | */ | ||
1794 | static int nfs3_xdr_dec_remove3res(struct rpc_rqst *req, | ||
1795 | struct xdr_stream *xdr, | ||
1796 | struct nfs_removeres *result) | ||
1797 | { | ||
1798 | enum nfs_stat status; | ||
1799 | int error; | ||
1800 | |||
1801 | error = decode_nfsstat3(xdr, &status); | ||
1802 | if (unlikely(error)) | ||
1803 | goto out; | ||
1804 | error = decode_wcc_data(xdr, result->dir_attr); | ||
1805 | if (unlikely(error)) | ||
1806 | goto out; | ||
1807 | if (status != NFS3_OK) | ||
1808 | goto out_status; | ||
1809 | out: | ||
1810 | return error; | ||
1811 | out_status: | ||
1812 | return nfs_stat_to_errno(status); | ||
1813 | } | ||
1019 | 1814 | ||
1020 | /* ignore invarsec */ | 1815 | /* |
1021 | return 0; | 1816 | * 3.3.14 RENAME3res |
1817 | * | ||
1818 | * struct RENAME3resok { | ||
1819 | * wcc_data fromdir_wcc; | ||
1820 | * wcc_data todir_wcc; | ||
1821 | * }; | ||
1822 | * | ||
1823 | * struct RENAME3resfail { | ||
1824 | * wcc_data fromdir_wcc; | ||
1825 | * wcc_data todir_wcc; | ||
1826 | * }; | ||
1827 | * | ||
1828 | * union RENAME3res switch (nfsstat3 status) { | ||
1829 | * case NFS3_OK: | ||
1830 | * RENAME3resok resok; | ||
1831 | * default: | ||
1832 | * RENAME3resfail resfail; | ||
1833 | * }; | ||
1834 | */ | ||
1835 | static int nfs3_xdr_dec_rename3res(struct rpc_rqst *req, | ||
1836 | struct xdr_stream *xdr, | ||
1837 | struct nfs_renameres *result) | ||
1838 | { | ||
1839 | enum nfs_stat status; | ||
1840 | int error; | ||
1841 | |||
1842 | error = decode_nfsstat3(xdr, &status); | ||
1843 | if (unlikely(error)) | ||
1844 | goto out; | ||
1845 | error = decode_wcc_data(xdr, result->old_fattr); | ||
1846 | if (unlikely(error)) | ||
1847 | goto out; | ||
1848 | error = decode_wcc_data(xdr, result->new_fattr); | ||
1849 | if (unlikely(error)) | ||
1850 | goto out; | ||
1851 | if (status != NFS3_OK) | ||
1852 | goto out_status; | ||
1853 | out: | ||
1854 | return error; | ||
1855 | out_status: | ||
1856 | return nfs_stat_to_errno(status); | ||
1022 | } | 1857 | } |
1023 | 1858 | ||
1024 | /* | 1859 | /* |
1025 | * Decode FSINFO reply | 1860 | * 3.3.15 LINK3res |
1861 | * | ||
1862 | * struct LINK3resok { | ||
1863 | * post_op_attr file_attributes; | ||
1864 | * wcc_data linkdir_wcc; | ||
1865 | * }; | ||
1866 | * | ||
1867 | * struct LINK3resfail { | ||
1868 | * post_op_attr file_attributes; | ||
1869 | * wcc_data linkdir_wcc; | ||
1870 | * }; | ||
1871 | * | ||
1872 | * union LINK3res switch (nfsstat3 status) { | ||
1873 | * case NFS3_OK: | ||
1874 | * LINK3resok resok; | ||
1875 | * default: | ||
1876 | * LINK3resfail resfail; | ||
1877 | * }; | ||
1026 | */ | 1878 | */ |
1027 | static int | 1879 | static int nfs3_xdr_dec_link3res(struct rpc_rqst *req, struct xdr_stream *xdr, |
1028 | nfs3_xdr_fsinfores(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *res) | 1880 | struct nfs3_linkres *result) |
1029 | { | 1881 | { |
1030 | int status; | 1882 | enum nfs_stat status; |
1883 | int error; | ||
1884 | |||
1885 | error = decode_nfsstat3(xdr, &status); | ||
1886 | if (unlikely(error)) | ||
1887 | goto out; | ||
1888 | error = decode_post_op_attr(xdr, result->fattr); | ||
1889 | if (unlikely(error)) | ||
1890 | goto out; | ||
1891 | error = decode_wcc_data(xdr, result->dir_attr); | ||
1892 | if (unlikely(error)) | ||
1893 | goto out; | ||
1894 | if (status != NFS3_OK) | ||
1895 | goto out_status; | ||
1896 | out: | ||
1897 | return error; | ||
1898 | out_status: | ||
1899 | return nfs_stat_to_errno(status); | ||
1900 | } | ||
1901 | |||
1902 | /** | ||
1903 | * nfs3_decode_dirent - Decode a single NFSv3 directory entry stored in | ||
1904 | * the local page cache | ||
1905 | * @xdr: XDR stream where entry resides | ||
1906 | * @entry: buffer to fill in with entry data | ||
1907 | * @plus: boolean indicating whether this should be a readdirplus entry | ||
1908 | * | ||
1909 | * Returns zero if successful, otherwise a negative errno value is | ||
1910 | * returned. | ||
1911 | * | ||
1912 | * This function is not invoked during READDIR reply decoding, but | ||
1913 | * rather whenever an application invokes the getdents(2) system call | ||
1914 | * on a directory already in our cache. | ||
1915 | * | ||
1916 | * 3.3.16 entry3 | ||
1917 | * | ||
1918 | * struct entry3 { | ||
1919 | * fileid3 fileid; | ||
1920 | * filename3 name; | ||
1921 | * cookie3 cookie; | ||
1922 | * fhandle3 filehandle; | ||
1923 | * post_op_attr3 attributes; | ||
1924 | * entry3 *nextentry; | ||
1925 | * }; | ||
1926 | * | ||
1927 | * 3.3.17 entryplus3 | ||
1928 | * struct entryplus3 { | ||
1929 | * fileid3 fileid; | ||
1930 | * filename3 name; | ||
1931 | * cookie3 cookie; | ||
1932 | * post_op_attr name_attributes; | ||
1933 | * post_op_fh3 name_handle; | ||
1934 | * entryplus3 *nextentry; | ||
1935 | * }; | ||
1936 | */ | ||
1937 | int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, | ||
1938 | int plus) | ||
1939 | { | ||
1940 | struct nfs_entry old = *entry; | ||
1941 | __be32 *p; | ||
1942 | int error; | ||
1943 | |||
1944 | p = xdr_inline_decode(xdr, 4); | ||
1945 | if (unlikely(p == NULL)) | ||
1946 | goto out_overflow; | ||
1947 | if (*p == xdr_zero) { | ||
1948 | p = xdr_inline_decode(xdr, 4); | ||
1949 | if (unlikely(p == NULL)) | ||
1950 | goto out_overflow; | ||
1951 | if (*p == xdr_zero) | ||
1952 | return -EAGAIN; | ||
1953 | entry->eof = 1; | ||
1954 | return -EBADCOOKIE; | ||
1955 | } | ||
1031 | 1956 | ||
1032 | status = ntohl(*p++); | 1957 | error = decode_fileid3(xdr, &entry->ino); |
1958 | if (unlikely(error)) | ||
1959 | return error; | ||
1033 | 1960 | ||
1034 | p = xdr_decode_post_op_attr(p, res->fattr); | 1961 | error = decode_inline_filename3(xdr, &entry->name, &entry->len); |
1035 | if (status != 0) | 1962 | if (unlikely(error)) |
1036 | return nfs_stat_to_errno(status); | 1963 | return error; |
1037 | 1964 | ||
1038 | res->rtmax = ntohl(*p++); | 1965 | entry->prev_cookie = entry->cookie; |
1039 | res->rtpref = ntohl(*p++); | 1966 | error = decode_cookie3(xdr, &entry->cookie); |
1040 | res->rtmult = ntohl(*p++); | 1967 | if (unlikely(error)) |
1041 | res->wtmax = ntohl(*p++); | 1968 | return error; |
1042 | res->wtpref = ntohl(*p++); | 1969 | |
1043 | res->wtmult = ntohl(*p++); | 1970 | entry->d_type = DT_UNKNOWN; |
1044 | res->dtpref = ntohl(*p++); | 1971 | |
1045 | p = xdr_decode_hyper(p, &res->maxfilesize); | 1972 | if (plus) { |
1973 | entry->fattr->valid = 0; | ||
1974 | error = decode_post_op_attr(xdr, entry->fattr); | ||
1975 | if (unlikely(error)) | ||
1976 | return error; | ||
1977 | if (entry->fattr->valid & NFS_ATTR_FATTR_V3) | ||
1978 | entry->d_type = nfs_umode_to_dtype(entry->fattr->mode); | ||
1979 | |||
1980 | /* In fact, a post_op_fh3: */ | ||
1981 | p = xdr_inline_decode(xdr, 4); | ||
1982 | if (unlikely(p == NULL)) | ||
1983 | goto out_overflow; | ||
1984 | if (*p != xdr_zero) { | ||
1985 | error = decode_nfs_fh3(xdr, entry->fh); | ||
1986 | if (unlikely(error)) { | ||
1987 | if (error == -E2BIG) | ||
1988 | goto out_truncated; | ||
1989 | return error; | ||
1990 | } | ||
1991 | } else | ||
1992 | zero_nfs_fh3(entry->fh); | ||
1993 | } | ||
1046 | 1994 | ||
1047 | /* ignore time_delta and properties */ | ||
1048 | res->lease_time = 0; | ||
1049 | return 0; | 1995 | return 0; |
1996 | |||
1997 | out_overflow: | ||
1998 | print_overflow_msg(__func__, xdr); | ||
1999 | return -EAGAIN; | ||
2000 | out_truncated: | ||
2001 | dprintk("NFS: directory entry contains invalid file handle\n"); | ||
2002 | *entry = old; | ||
2003 | return -EAGAIN; | ||
1050 | } | 2004 | } |
1051 | 2005 | ||
1052 | /* | 2006 | /* |
1053 | * Decode PATHCONF reply | 2007 | * 3.3.16 READDIR3res |
2008 | * | ||
2009 | * struct dirlist3 { | ||
2010 | * entry3 *entries; | ||
2011 | * bool eof; | ||
2012 | * }; | ||
2013 | * | ||
2014 | * struct READDIR3resok { | ||
2015 | * post_op_attr dir_attributes; | ||
2016 | * cookieverf3 cookieverf; | ||
2017 | * dirlist3 reply; | ||
2018 | * }; | ||
2019 | * | ||
2020 | * struct READDIR3resfail { | ||
2021 | * post_op_attr dir_attributes; | ||
2022 | * }; | ||
2023 | * | ||
2024 | * union READDIR3res switch (nfsstat3 status) { | ||
2025 | * case NFS3_OK: | ||
2026 | * READDIR3resok resok; | ||
2027 | * default: | ||
2028 | * READDIR3resfail resfail; | ||
2029 | * }; | ||
2030 | * | ||
2031 | * Read the directory contents into the page cache, but otherwise | ||
2032 | * don't touch them. The actual decoding is done by nfs3_decode_entry() | ||
2033 | * during subsequent nfs_readdir() calls. | ||
1054 | */ | 2034 | */ |
1055 | static int | 2035 | static int decode_dirlist3(struct xdr_stream *xdr) |
1056 | nfs3_xdr_pathconfres(struct rpc_rqst *req, __be32 *p, struct nfs_pathconf *res) | ||
1057 | { | 2036 | { |
1058 | int status; | 2037 | u32 recvd, pglen; |
2038 | size_t hdrlen; | ||
1059 | 2039 | ||
1060 | status = ntohl(*p++); | 2040 | pglen = xdr->buf->page_len; |
2041 | hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base; | ||
2042 | recvd = xdr->buf->len - hdrlen; | ||
2043 | if (unlikely(pglen > recvd)) | ||
2044 | goto out_cheating; | ||
2045 | out: | ||
2046 | xdr_read_pages(xdr, pglen); | ||
2047 | return pglen; | ||
2048 | out_cheating: | ||
2049 | dprintk("NFS: server cheating in readdir result: " | ||
2050 | "pglen %u > recvd %u\n", pglen, recvd); | ||
2051 | pglen = recvd; | ||
2052 | goto out; | ||
2053 | } | ||
1061 | 2054 | ||
1062 | p = xdr_decode_post_op_attr(p, res->fattr); | 2055 | static int decode_readdir3resok(struct xdr_stream *xdr, |
1063 | if (status != 0) | 2056 | struct nfs3_readdirres *result) |
1064 | return nfs_stat_to_errno(status); | 2057 | { |
1065 | res->max_link = ntohl(*p++); | 2058 | int error; |
1066 | res->max_namelen = ntohl(*p++); | 2059 | |
2060 | error = decode_post_op_attr(xdr, result->dir_attr); | ||
2061 | if (unlikely(error)) | ||
2062 | goto out; | ||
2063 | /* XXX: do we need to check if result->verf != NULL ? */ | ||
2064 | error = decode_cookieverf3(xdr, result->verf); | ||
2065 | if (unlikely(error)) | ||
2066 | goto out; | ||
2067 | error = decode_dirlist3(xdr); | ||
2068 | out: | ||
2069 | return error; | ||
2070 | } | ||
1067 | 2071 | ||
1068 | /* ignore remaining fields */ | 2072 | static int nfs3_xdr_dec_readdir3res(struct rpc_rqst *req, |
1069 | return 0; | 2073 | struct xdr_stream *xdr, |
2074 | struct nfs3_readdirres *result) | ||
2075 | { | ||
2076 | enum nfs_stat status; | ||
2077 | int error; | ||
2078 | |||
2079 | error = decode_nfsstat3(xdr, &status); | ||
2080 | if (unlikely(error)) | ||
2081 | goto out; | ||
2082 | if (status != NFS3_OK) | ||
2083 | goto out_default; | ||
2084 | error = decode_readdir3resok(xdr, result); | ||
2085 | out: | ||
2086 | return error; | ||
2087 | out_default: | ||
2088 | error = decode_post_op_attr(xdr, result->dir_attr); | ||
2089 | if (unlikely(error)) | ||
2090 | goto out; | ||
2091 | return nfs_stat_to_errno(status); | ||
1070 | } | 2092 | } |
1071 | 2093 | ||
1072 | /* | 2094 | /* |
1073 | * Decode COMMIT reply | 2095 | * 3.3.18 FSSTAT3res |
2096 | * | ||
2097 | * struct FSSTAT3resok { | ||
2098 | * post_op_attr obj_attributes; | ||
2099 | * size3 tbytes; | ||
2100 | * size3 fbytes; | ||
2101 | * size3 abytes; | ||
2102 | * size3 tfiles; | ||
2103 | * size3 ffiles; | ||
2104 | * size3 afiles; | ||
2105 | * uint32 invarsec; | ||
2106 | * }; | ||
2107 | * | ||
2108 | * struct FSSTAT3resfail { | ||
2109 | * post_op_attr obj_attributes; | ||
2110 | * }; | ||
2111 | * | ||
2112 | * union FSSTAT3res switch (nfsstat3 status) { | ||
2113 | * case NFS3_OK: | ||
2114 | * FSSTAT3resok resok; | ||
2115 | * default: | ||
2116 | * FSSTAT3resfail resfail; | ||
2117 | * }; | ||
1074 | */ | 2118 | */ |
1075 | static int | 2119 | static int decode_fsstat3resok(struct xdr_stream *xdr, |
1076 | nfs3_xdr_commitres(struct rpc_rqst *req, __be32 *p, struct nfs_writeres *res) | 2120 | struct nfs_fsstat *result) |
1077 | { | 2121 | { |
1078 | int status; | 2122 | __be32 *p; |
2123 | |||
2124 | p = xdr_inline_decode(xdr, 8 * 6 + 4); | ||
2125 | if (unlikely(p == NULL)) | ||
2126 | goto out_overflow; | ||
2127 | p = xdr_decode_size3(p, &result->tbytes); | ||
2128 | p = xdr_decode_size3(p, &result->fbytes); | ||
2129 | p = xdr_decode_size3(p, &result->abytes); | ||
2130 | p = xdr_decode_size3(p, &result->tfiles); | ||
2131 | p = xdr_decode_size3(p, &result->ffiles); | ||
2132 | xdr_decode_size3(p, &result->afiles); | ||
2133 | /* ignore invarsec */ | ||
2134 | return 0; | ||
2135 | out_overflow: | ||
2136 | print_overflow_msg(__func__, xdr); | ||
2137 | return -EIO; | ||
2138 | } | ||
1079 | 2139 | ||
1080 | status = ntohl(*p++); | 2140 | static int nfs3_xdr_dec_fsstat3res(struct rpc_rqst *req, |
1081 | p = xdr_decode_wcc_data(p, res->fattr); | 2141 | struct xdr_stream *xdr, |
1082 | if (status != 0) | 2142 | struct nfs_fsstat *result) |
1083 | return nfs_stat_to_errno(status); | 2143 | { |
2144 | enum nfs_stat status; | ||
2145 | int error; | ||
2146 | |||
2147 | error = decode_nfsstat3(xdr, &status); | ||
2148 | if (unlikely(error)) | ||
2149 | goto out; | ||
2150 | error = decode_post_op_attr(xdr, result->fattr); | ||
2151 | if (unlikely(error)) | ||
2152 | goto out; | ||
2153 | if (status != NFS3_OK) | ||
2154 | goto out_status; | ||
2155 | error = decode_fsstat3resok(xdr, result); | ||
2156 | out: | ||
2157 | return error; | ||
2158 | out_status: | ||
2159 | return nfs_stat_to_errno(status); | ||
2160 | } | ||
1084 | 2161 | ||
1085 | res->verf->verifier[0] = *p++; | 2162 | /* |
1086 | res->verf->verifier[1] = *p++; | 2163 | * 3.3.19 FSINFO3res |
2164 | * | ||
2165 | * struct FSINFO3resok { | ||
2166 | * post_op_attr obj_attributes; | ||
2167 | * uint32 rtmax; | ||
2168 | * uint32 rtpref; | ||
2169 | * uint32 rtmult; | ||
2170 | * uint32 wtmax; | ||
2171 | * uint32 wtpref; | ||
2172 | * uint32 wtmult; | ||
2173 | * uint32 dtpref; | ||
2174 | * size3 maxfilesize; | ||
2175 | * nfstime3 time_delta; | ||
2176 | * uint32 properties; | ||
2177 | * }; | ||
2178 | * | ||
2179 | * struct FSINFO3resfail { | ||
2180 | * post_op_attr obj_attributes; | ||
2181 | * }; | ||
2182 | * | ||
2183 | * union FSINFO3res switch (nfsstat3 status) { | ||
2184 | * case NFS3_OK: | ||
2185 | * FSINFO3resok resok; | ||
2186 | * default: | ||
2187 | * FSINFO3resfail resfail; | ||
2188 | * }; | ||
2189 | */ | ||
2190 | static int decode_fsinfo3resok(struct xdr_stream *xdr, | ||
2191 | struct nfs_fsinfo *result) | ||
2192 | { | ||
2193 | __be32 *p; | ||
2194 | |||
2195 | p = xdr_inline_decode(xdr, 4 * 7 + 8 + 8 + 4); | ||
2196 | if (unlikely(p == NULL)) | ||
2197 | goto out_overflow; | ||
2198 | result->rtmax = be32_to_cpup(p++); | ||
2199 | result->rtpref = be32_to_cpup(p++); | ||
2200 | result->rtmult = be32_to_cpup(p++); | ||
2201 | result->wtmax = be32_to_cpup(p++); | ||
2202 | result->wtpref = be32_to_cpup(p++); | ||
2203 | result->wtmult = be32_to_cpup(p++); | ||
2204 | result->dtpref = be32_to_cpup(p++); | ||
2205 | p = xdr_decode_size3(p, &result->maxfilesize); | ||
2206 | xdr_decode_nfstime3(p, &result->time_delta); | ||
2207 | |||
2208 | /* ignore properties */ | ||
2209 | result->lease_time = 0; | ||
1087 | return 0; | 2210 | return 0; |
2211 | out_overflow: | ||
2212 | print_overflow_msg(__func__, xdr); | ||
2213 | return -EIO; | ||
2214 | } | ||
2215 | |||
2216 | static int nfs3_xdr_dec_fsinfo3res(struct rpc_rqst *req, | ||
2217 | struct xdr_stream *xdr, | ||
2218 | struct nfs_fsinfo *result) | ||
2219 | { | ||
2220 | enum nfs_stat status; | ||
2221 | int error; | ||
2222 | |||
2223 | error = decode_nfsstat3(xdr, &status); | ||
2224 | if (unlikely(error)) | ||
2225 | goto out; | ||
2226 | error = decode_post_op_attr(xdr, result->fattr); | ||
2227 | if (unlikely(error)) | ||
2228 | goto out; | ||
2229 | if (status != NFS3_OK) | ||
2230 | goto out_status; | ||
2231 | error = decode_fsinfo3resok(xdr, result); | ||
2232 | out: | ||
2233 | return error; | ||
2234 | out_status: | ||
2235 | return nfs_stat_to_errno(status); | ||
1088 | } | 2236 | } |
1089 | 2237 | ||
1090 | #ifdef CONFIG_NFS_V3_ACL | ||
1091 | /* | 2238 | /* |
1092 | * Decode GETACL reply | 2239 | * 3.3.20 PATHCONF3res |
2240 | * | ||
2241 | * struct PATHCONF3resok { | ||
2242 | * post_op_attr obj_attributes; | ||
2243 | * uint32 linkmax; | ||
2244 | * uint32 name_max; | ||
2245 | * bool no_trunc; | ||
2246 | * bool chown_restricted; | ||
2247 | * bool case_insensitive; | ||
2248 | * bool case_preserving; | ||
2249 | * }; | ||
2250 | * | ||
2251 | * struct PATHCONF3resfail { | ||
2252 | * post_op_attr obj_attributes; | ||
2253 | * }; | ||
2254 | * | ||
2255 | * union PATHCONF3res switch (nfsstat3 status) { | ||
2256 | * case NFS3_OK: | ||
2257 | * PATHCONF3resok resok; | ||
2258 | * default: | ||
2259 | * PATHCONF3resfail resfail; | ||
2260 | * }; | ||
1093 | */ | 2261 | */ |
1094 | static int | 2262 | static int decode_pathconf3resok(struct xdr_stream *xdr, |
1095 | nfs3_xdr_getaclres(struct rpc_rqst *req, __be32 *p, | 2263 | struct nfs_pathconf *result) |
1096 | struct nfs3_getaclres *res) | ||
1097 | { | 2264 | { |
1098 | struct xdr_buf *buf = &req->rq_rcv_buf; | 2265 | __be32 *p; |
1099 | int status = ntohl(*p++); | ||
1100 | struct posix_acl **acl; | ||
1101 | unsigned int *aclcnt; | ||
1102 | int err, base; | ||
1103 | |||
1104 | if (status != 0) | ||
1105 | return nfs_stat_to_errno(status); | ||
1106 | p = xdr_decode_post_op_attr(p, res->fattr); | ||
1107 | res->mask = ntohl(*p++); | ||
1108 | if (res->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)) | ||
1109 | return -EINVAL; | ||
1110 | base = (char *)p - (char *)req->rq_rcv_buf.head->iov_base; | ||
1111 | 2266 | ||
1112 | acl = (res->mask & NFS_ACL) ? &res->acl_access : NULL; | 2267 | p = xdr_inline_decode(xdr, 4 * 6); |
1113 | aclcnt = (res->mask & NFS_ACLCNT) ? &res->acl_access_count : NULL; | 2268 | if (unlikely(p == NULL)) |
1114 | err = nfsacl_decode(buf, base, aclcnt, acl); | 2269 | goto out_overflow; |
2270 | result->max_link = be32_to_cpup(p++); | ||
2271 | result->max_namelen = be32_to_cpup(p); | ||
2272 | /* ignore remaining fields */ | ||
2273 | return 0; | ||
2274 | out_overflow: | ||
2275 | print_overflow_msg(__func__, xdr); | ||
2276 | return -EIO; | ||
2277 | } | ||
1115 | 2278 | ||
1116 | acl = (res->mask & NFS_DFACL) ? &res->acl_default : NULL; | 2279 | static int nfs3_xdr_dec_pathconf3res(struct rpc_rqst *req, |
1117 | aclcnt = (res->mask & NFS_DFACLCNT) ? &res->acl_default_count : NULL; | 2280 | struct xdr_stream *xdr, |
1118 | if (err > 0) | 2281 | struct nfs_pathconf *result) |
1119 | err = nfsacl_decode(buf, base + err, aclcnt, acl); | 2282 | { |
1120 | return (err > 0) ? 0 : err; | 2283 | enum nfs_stat status; |
2284 | int error; | ||
2285 | |||
2286 | error = decode_nfsstat3(xdr, &status); | ||
2287 | if (unlikely(error)) | ||
2288 | goto out; | ||
2289 | error = decode_post_op_attr(xdr, result->fattr); | ||
2290 | if (unlikely(error)) | ||
2291 | goto out; | ||
2292 | if (status != NFS3_OK) | ||
2293 | goto out_status; | ||
2294 | error = decode_pathconf3resok(xdr, result); | ||
2295 | out: | ||
2296 | return error; | ||
2297 | out_status: | ||
2298 | return nfs_stat_to_errno(status); | ||
1121 | } | 2299 | } |
1122 | 2300 | ||
1123 | /* | 2301 | /* |
1124 | * Decode setacl reply. | 2302 | * 3.3.21 COMMIT3res |
2303 | * | ||
2304 | * struct COMMIT3resok { | ||
2305 | * wcc_data file_wcc; | ||
2306 | * writeverf3 verf; | ||
2307 | * }; | ||
2308 | * | ||
2309 | * struct COMMIT3resfail { | ||
2310 | * wcc_data file_wcc; | ||
2311 | * }; | ||
2312 | * | ||
2313 | * union COMMIT3res switch (nfsstat3 status) { | ||
2314 | * case NFS3_OK: | ||
2315 | * COMMIT3resok resok; | ||
2316 | * default: | ||
2317 | * COMMIT3resfail resfail; | ||
2318 | * }; | ||
1125 | */ | 2319 | */ |
1126 | static int | 2320 | static int nfs3_xdr_dec_commit3res(struct rpc_rqst *req, |
1127 | nfs3_xdr_setaclres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) | 2321 | struct xdr_stream *xdr, |
2322 | struct nfs_writeres *result) | ||
1128 | { | 2323 | { |
1129 | int status = ntohl(*p++); | 2324 | enum nfs_stat status; |
2325 | int error; | ||
2326 | |||
2327 | error = decode_nfsstat3(xdr, &status); | ||
2328 | if (unlikely(error)) | ||
2329 | goto out; | ||
2330 | error = decode_wcc_data(xdr, result->fattr); | ||
2331 | if (unlikely(error)) | ||
2332 | goto out; | ||
2333 | if (status != NFS3_OK) | ||
2334 | goto out_status; | ||
2335 | error = decode_writeverf3(xdr, result->verf->verifier); | ||
2336 | out: | ||
2337 | return error; | ||
2338 | out_status: | ||
2339 | return nfs_stat_to_errno(status); | ||
2340 | } | ||
1130 | 2341 | ||
1131 | if (status) | 2342 | #ifdef CONFIG_NFS_V3_ACL |
1132 | return nfs_stat_to_errno(status); | 2343 | |
1133 | xdr_decode_post_op_attr(p, fattr); | 2344 | static inline int decode_getacl3resok(struct xdr_stream *xdr, |
1134 | return 0; | 2345 | struct nfs3_getaclres *result) |
2346 | { | ||
2347 | struct posix_acl **acl; | ||
2348 | unsigned int *aclcnt; | ||
2349 | size_t hdrlen; | ||
2350 | int error; | ||
2351 | |||
2352 | error = decode_post_op_attr(xdr, result->fattr); | ||
2353 | if (unlikely(error)) | ||
2354 | goto out; | ||
2355 | error = decode_uint32(xdr, &result->mask); | ||
2356 | if (unlikely(error)) | ||
2357 | goto out; | ||
2358 | error = -EINVAL; | ||
2359 | if (result->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)) | ||
2360 | goto out; | ||
2361 | |||
2362 | hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base; | ||
2363 | |||
2364 | acl = NULL; | ||
2365 | if (result->mask & NFS_ACL) | ||
2366 | acl = &result->acl_access; | ||
2367 | aclcnt = NULL; | ||
2368 | if (result->mask & NFS_ACLCNT) | ||
2369 | aclcnt = &result->acl_access_count; | ||
2370 | error = nfsacl_decode(xdr->buf, hdrlen, aclcnt, acl); | ||
2371 | if (unlikely(error <= 0)) | ||
2372 | goto out; | ||
2373 | |||
2374 | acl = NULL; | ||
2375 | if (result->mask & NFS_DFACL) | ||
2376 | acl = &result->acl_default; | ||
2377 | aclcnt = NULL; | ||
2378 | if (result->mask & NFS_DFACLCNT) | ||
2379 | aclcnt = &result->acl_default_count; | ||
2380 | error = nfsacl_decode(xdr->buf, hdrlen + error, aclcnt, acl); | ||
2381 | if (unlikely(error <= 0)) | ||
2382 | return error; | ||
2383 | error = 0; | ||
2384 | out: | ||
2385 | return error; | ||
2386 | } | ||
2387 | |||
2388 | static int nfs3_xdr_dec_getacl3res(struct rpc_rqst *req, | ||
2389 | struct xdr_stream *xdr, | ||
2390 | struct nfs3_getaclres *result) | ||
2391 | { | ||
2392 | enum nfs_stat status; | ||
2393 | int error; | ||
2394 | |||
2395 | error = decode_nfsstat3(xdr, &status); | ||
2396 | if (unlikely(error)) | ||
2397 | goto out; | ||
2398 | if (status != NFS3_OK) | ||
2399 | goto out_default; | ||
2400 | error = decode_getacl3resok(xdr, result); | ||
2401 | out: | ||
2402 | return error; | ||
2403 | out_default: | ||
2404 | return nfs_stat_to_errno(status); | ||
1135 | } | 2405 | } |
2406 | |||
2407 | static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req, | ||
2408 | struct xdr_stream *xdr, | ||
2409 | struct nfs_fattr *result) | ||
2410 | { | ||
2411 | enum nfs_stat status; | ||
2412 | int error; | ||
2413 | |||
2414 | error = decode_nfsstat3(xdr, &status); | ||
2415 | if (unlikely(error)) | ||
2416 | goto out; | ||
2417 | if (status != NFS3_OK) | ||
2418 | goto out_default; | ||
2419 | error = decode_post_op_attr(xdr, result); | ||
2420 | out: | ||
2421 | return error; | ||
2422 | out_default: | ||
2423 | return nfs_stat_to_errno(status); | ||
2424 | } | ||
2425 | |||
1136 | #endif /* CONFIG_NFS_V3_ACL */ | 2426 | #endif /* CONFIG_NFS_V3_ACL */ |
1137 | 2427 | ||
1138 | #define PROC(proc, argtype, restype, timer) \ | 2428 | #define PROC(proc, argtype, restype, timer) \ |
1139 | [NFS3PROC_##proc] = { \ | 2429 | [NFS3PROC_##proc] = { \ |
1140 | .p_proc = NFS3PROC_##proc, \ | 2430 | .p_proc = NFS3PROC_##proc, \ |
1141 | .p_encode = (kxdrproc_t) nfs3_xdr_##argtype, \ | 2431 | .p_encode = (kxdreproc_t)nfs3_xdr_enc_##argtype##3args, \ |
1142 | .p_decode = (kxdrproc_t) nfs3_xdr_##restype, \ | 2432 | .p_decode = (kxdrdproc_t)nfs3_xdr_dec_##restype##3res, \ |
1143 | .p_arglen = NFS3_##argtype##_sz, \ | 2433 | .p_arglen = NFS3_##argtype##args_sz, \ |
1144 | .p_replen = NFS3_##restype##_sz, \ | 2434 | .p_replen = NFS3_##restype##res_sz, \ |
1145 | .p_timer = timer, \ | 2435 | .p_timer = timer, \ |
1146 | .p_statidx = NFS3PROC_##proc, \ | 2436 | .p_statidx = NFS3PROC_##proc, \ |
1147 | .p_name = #proc, \ | 2437 | .p_name = #proc, \ |
1148 | } | 2438 | } |
1149 | 2439 | ||
1150 | struct rpc_procinfo nfs3_procedures[] = { | 2440 | struct rpc_procinfo nfs3_procedures[] = { |
1151 | PROC(GETATTR, fhandle, attrstat, 1), | 2441 | PROC(GETATTR, getattr, getattr, 1), |
1152 | PROC(SETATTR, sattrargs, wccstat, 0), | 2442 | PROC(SETATTR, setattr, setattr, 0), |
1153 | PROC(LOOKUP, diropargs, lookupres, 2), | 2443 | PROC(LOOKUP, lookup, lookup, 2), |
1154 | PROC(ACCESS, accessargs, accessres, 1), | 2444 | PROC(ACCESS, access, access, 1), |
1155 | PROC(READLINK, readlinkargs, readlinkres, 3), | 2445 | PROC(READLINK, readlink, readlink, 3), |
1156 | PROC(READ, readargs, readres, 3), | 2446 | PROC(READ, read, read, 3), |
1157 | PROC(WRITE, writeargs, writeres, 4), | 2447 | PROC(WRITE, write, write, 4), |
1158 | PROC(CREATE, createargs, createres, 0), | 2448 | PROC(CREATE, create, create, 0), |
1159 | PROC(MKDIR, mkdirargs, createres, 0), | 2449 | PROC(MKDIR, mkdir, create, 0), |
1160 | PROC(SYMLINK, symlinkargs, createres, 0), | 2450 | PROC(SYMLINK, symlink, create, 0), |
1161 | PROC(MKNOD, mknodargs, createres, 0), | 2451 | PROC(MKNOD, mknod, create, 0), |
1162 | PROC(REMOVE, removeargs, removeres, 0), | 2452 | PROC(REMOVE, remove, remove, 0), |
1163 | PROC(RMDIR, diropargs, wccstat, 0), | 2453 | PROC(RMDIR, lookup, setattr, 0), |
1164 | PROC(RENAME, renameargs, renameres, 0), | 2454 | PROC(RENAME, rename, rename, 0), |
1165 | PROC(LINK, linkargs, linkres, 0), | 2455 | PROC(LINK, link, link, 0), |
1166 | PROC(READDIR, readdirargs, readdirres, 3), | 2456 | PROC(READDIR, readdir, readdir, 3), |
1167 | PROC(READDIRPLUS, readdirargs, readdirres, 3), | 2457 | PROC(READDIRPLUS, readdirplus, readdir, 3), |
1168 | PROC(FSSTAT, fhandle, fsstatres, 0), | 2458 | PROC(FSSTAT, getattr, fsstat, 0), |
1169 | PROC(FSINFO, fhandle, fsinfores, 0), | 2459 | PROC(FSINFO, getattr, fsinfo, 0), |
1170 | PROC(PATHCONF, fhandle, pathconfres, 0), | 2460 | PROC(PATHCONF, getattr, pathconf, 0), |
1171 | PROC(COMMIT, commitargs, commitres, 5), | 2461 | PROC(COMMIT, commit, commit, 5), |
1172 | }; | 2462 | }; |
1173 | 2463 | ||
1174 | struct rpc_version nfs_version3 = { | 2464 | struct rpc_version nfs_version3 = { |
@@ -1181,8 +2471,8 @@ struct rpc_version nfs_version3 = { | |||
1181 | static struct rpc_procinfo nfs3_acl_procedures[] = { | 2471 | static struct rpc_procinfo nfs3_acl_procedures[] = { |
1182 | [ACLPROC3_GETACL] = { | 2472 | [ACLPROC3_GETACL] = { |
1183 | .p_proc = ACLPROC3_GETACL, | 2473 | .p_proc = ACLPROC3_GETACL, |
1184 | .p_encode = (kxdrproc_t) nfs3_xdr_getaclargs, | 2474 | .p_encode = (kxdreproc_t)nfs3_xdr_enc_getacl3args, |
1185 | .p_decode = (kxdrproc_t) nfs3_xdr_getaclres, | 2475 | .p_decode = (kxdrdproc_t)nfs3_xdr_dec_getacl3res, |
1186 | .p_arglen = ACL3_getaclargs_sz, | 2476 | .p_arglen = ACL3_getaclargs_sz, |
1187 | .p_replen = ACL3_getaclres_sz, | 2477 | .p_replen = ACL3_getaclres_sz, |
1188 | .p_timer = 1, | 2478 | .p_timer = 1, |
@@ -1190,8 +2480,8 @@ static struct rpc_procinfo nfs3_acl_procedures[] = { | |||
1190 | }, | 2480 | }, |
1191 | [ACLPROC3_SETACL] = { | 2481 | [ACLPROC3_SETACL] = { |
1192 | .p_proc = ACLPROC3_SETACL, | 2482 | .p_proc = ACLPROC3_SETACL, |
1193 | .p_encode = (kxdrproc_t) nfs3_xdr_setaclargs, | 2483 | .p_encode = (kxdreproc_t)nfs3_xdr_enc_setacl3args, |
1194 | .p_decode = (kxdrproc_t) nfs3_xdr_setaclres, | 2484 | .p_decode = (kxdrdproc_t)nfs3_xdr_dec_setacl3res, |
1195 | .p_arglen = ACL3_setaclargs_sz, | 2485 | .p_arglen = ACL3_setaclargs_sz, |
1196 | .p_replen = ACL3_setaclres_sz, | 2486 | .p_replen = ACL3_setaclres_sz, |
1197 | .p_timer = 0, | 2487 | .p_timer = 0, |