diff options
Diffstat (limited to 'fs/lockd/xdr4.c')
-rw-r--r-- | fs/lockd/xdr4.c | 255 |
1 files changed, 0 insertions, 255 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index ad9dbbc9145d..dfa4789cd460 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c | |||
@@ -93,15 +93,6 @@ nlm4_decode_fh(__be32 *p, struct nfs_fh *f) | |||
93 | return p + XDR_QUADLEN(f->size); | 93 | return p + XDR_QUADLEN(f->size); |
94 | } | 94 | } |
95 | 95 | ||
96 | static __be32 * | ||
97 | nlm4_encode_fh(__be32 *p, struct nfs_fh *f) | ||
98 | { | ||
99 | *p++ = htonl(f->size); | ||
100 | if (f->size) p[XDR_QUADLEN(f->size)-1] = 0; /* don't leak anything */ | ||
101 | memcpy(p, f->data, f->size); | ||
102 | return p + XDR_QUADLEN(f->size); | ||
103 | } | ||
104 | |||
105 | /* | 96 | /* |
106 | * Encode and decode owner handle | 97 | * Encode and decode owner handle |
107 | */ | 98 | */ |
@@ -112,12 +103,6 @@ nlm4_decode_oh(__be32 *p, struct xdr_netobj *oh) | |||
112 | } | 103 | } |
113 | 104 | ||
114 | static __be32 * | 105 | static __be32 * |
115 | nlm4_encode_oh(__be32 *p, struct xdr_netobj *oh) | ||
116 | { | ||
117 | return xdr_encode_netobj(p, oh); | ||
118 | } | ||
119 | |||
120 | static __be32 * | ||
121 | nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) | 106 | nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) |
122 | { | 107 | { |
123 | struct file_lock *fl = &lock->fl; | 108 | struct file_lock *fl = &lock->fl; |
@@ -150,38 +135,6 @@ nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) | |||
150 | } | 135 | } |
151 | 136 | ||
152 | /* | 137 | /* |
153 | * Encode a lock as part of an NLM call | ||
154 | */ | ||
155 | static __be32 * | ||
156 | nlm4_encode_lock(__be32 *p, struct nlm_lock *lock) | ||
157 | { | ||
158 | struct file_lock *fl = &lock->fl; | ||
159 | __s64 start, len; | ||
160 | |||
161 | if (!(p = xdr_encode_string(p, lock->caller)) | ||
162 | || !(p = nlm4_encode_fh(p, &lock->fh)) | ||
163 | || !(p = nlm4_encode_oh(p, &lock->oh))) | ||
164 | return NULL; | ||
165 | |||
166 | if (fl->fl_start > NLM4_OFFSET_MAX | ||
167 | || (fl->fl_end > NLM4_OFFSET_MAX && fl->fl_end != OFFSET_MAX)) | ||
168 | return NULL; | ||
169 | |||
170 | *p++ = htonl(lock->svid); | ||
171 | |||
172 | start = loff_t_to_s64(fl->fl_start); | ||
173 | if (fl->fl_end == OFFSET_MAX) | ||
174 | len = 0; | ||
175 | else | ||
176 | len = loff_t_to_s64(fl->fl_end - fl->fl_start + 1); | ||
177 | |||
178 | p = xdr_encode_hyper(p, start); | ||
179 | p = xdr_encode_hyper(p, len); | ||
180 | |||
181 | return p; | ||
182 | } | ||
183 | |||
184 | /* | ||
185 | * Encode result of a TEST/TEST_MSG call | 138 | * Encode result of a TEST/TEST_MSG call |
186 | */ | 139 | */ |
187 | static __be32 * | 140 | static __be32 * |
@@ -379,211 +332,3 @@ nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) | |||
379 | { | 332 | { |
380 | return xdr_ressize_check(rqstp, p); | 333 | return xdr_ressize_check(rqstp, p); |
381 | } | 334 | } |
382 | |||
383 | /* | ||
384 | * Now, the client side XDR functions | ||
385 | */ | ||
386 | #ifdef NLMCLNT_SUPPORT_SHARES | ||
387 | static int | ||
388 | nlm4clt_decode_void(struct rpc_rqst *req, __be32 *p, void *ptr) | ||
389 | { | ||
390 | return 0; | ||
391 | } | ||
392 | #endif | ||
393 | |||
394 | static int | ||
395 | nlm4clt_encode_testargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) | ||
396 | { | ||
397 | struct nlm_lock *lock = &argp->lock; | ||
398 | |||
399 | if (!(p = nlm4_encode_cookie(p, &argp->cookie))) | ||
400 | return -EIO; | ||
401 | *p++ = (lock->fl.fl_type == F_WRLCK)? xdr_one : xdr_zero; | ||
402 | if (!(p = nlm4_encode_lock(p, lock))) | ||
403 | return -EIO; | ||
404 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
405 | return 0; | ||
406 | } | ||
407 | |||
408 | static int | ||
409 | nlm4clt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | ||
410 | { | ||
411 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | ||
412 | return -EIO; | ||
413 | resp->status = *p++; | ||
414 | if (resp->status == nlm_lck_denied) { | ||
415 | struct file_lock *fl = &resp->lock.fl; | ||
416 | u32 excl; | ||
417 | __u64 start, len; | ||
418 | __s64 end; | ||
419 | |||
420 | memset(&resp->lock, 0, sizeof(resp->lock)); | ||
421 | locks_init_lock(fl); | ||
422 | excl = ntohl(*p++); | ||
423 | resp->lock.svid = ntohl(*p++); | ||
424 | fl->fl_pid = (pid_t)resp->lock.svid; | ||
425 | if (!(p = nlm4_decode_oh(p, &resp->lock.oh))) | ||
426 | return -EIO; | ||
427 | |||
428 | fl->fl_flags = FL_POSIX; | ||
429 | fl->fl_type = excl? F_WRLCK : F_RDLCK; | ||
430 | p = xdr_decode_hyper(p, &start); | ||
431 | p = xdr_decode_hyper(p, &len); | ||
432 | end = start + len - 1; | ||
433 | |||
434 | fl->fl_start = s64_to_loff_t(start); | ||
435 | if (len == 0 || end < 0) | ||
436 | fl->fl_end = OFFSET_MAX; | ||
437 | else | ||
438 | fl->fl_end = s64_to_loff_t(end); | ||
439 | } | ||
440 | return 0; | ||
441 | } | ||
442 | |||
443 | |||
444 | static int | ||
445 | nlm4clt_encode_lockargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) | ||
446 | { | ||
447 | struct nlm_lock *lock = &argp->lock; | ||
448 | |||
449 | if (!(p = nlm4_encode_cookie(p, &argp->cookie))) | ||
450 | return -EIO; | ||
451 | *p++ = argp->block? xdr_one : xdr_zero; | ||
452 | *p++ = (lock->fl.fl_type == F_WRLCK)? xdr_one : xdr_zero; | ||
453 | if (!(p = nlm4_encode_lock(p, lock))) | ||
454 | return -EIO; | ||
455 | *p++ = argp->reclaim? xdr_one : xdr_zero; | ||
456 | *p++ = htonl(argp->state); | ||
457 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
458 | return 0; | ||
459 | } | ||
460 | |||
461 | static int | ||
462 | nlm4clt_encode_cancargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) | ||
463 | { | ||
464 | struct nlm_lock *lock = &argp->lock; | ||
465 | |||
466 | if (!(p = nlm4_encode_cookie(p, &argp->cookie))) | ||
467 | return -EIO; | ||
468 | *p++ = argp->block? xdr_one : xdr_zero; | ||
469 | *p++ = (lock->fl.fl_type == F_WRLCK)? xdr_one : xdr_zero; | ||
470 | if (!(p = nlm4_encode_lock(p, lock))) | ||
471 | return -EIO; | ||
472 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
473 | return 0; | ||
474 | } | ||
475 | |||
476 | static int | ||
477 | nlm4clt_encode_unlockargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) | ||
478 | { | ||
479 | struct nlm_lock *lock = &argp->lock; | ||
480 | |||
481 | if (!(p = nlm4_encode_cookie(p, &argp->cookie))) | ||
482 | return -EIO; | ||
483 | if (!(p = nlm4_encode_lock(p, lock))) | ||
484 | return -EIO; | ||
485 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
486 | return 0; | ||
487 | } | ||
488 | |||
489 | static int | ||
490 | nlm4clt_encode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | ||
491 | { | ||
492 | if (!(p = nlm4_encode_cookie(p, &resp->cookie))) | ||
493 | return -EIO; | ||
494 | *p++ = resp->status; | ||
495 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
496 | return 0; | ||
497 | } | ||
498 | |||
499 | static int | ||
500 | nlm4clt_encode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | ||
501 | { | ||
502 | if (!(p = nlm4_encode_testres(p, resp))) | ||
503 | return -EIO; | ||
504 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | ||
505 | return 0; | ||
506 | } | ||
507 | |||
508 | static int | ||
509 | nlm4clt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | ||
510 | { | ||
511 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | ||
512 | return -EIO; | ||
513 | resp->status = *p++; | ||
514 | return 0; | ||
515 | } | ||
516 | |||
517 | #if (NLMCLNT_OHSIZE > XDR_MAX_NETOBJ) | ||
518 | # error "NLM host name cannot be larger than XDR_MAX_NETOBJ!" | ||
519 | #endif | ||
520 | |||
521 | #if (NLMCLNT_OHSIZE > NLM_MAXSTRLEN) | ||
522 | # error "NLM host name cannot be larger than NLM's maximum string length!" | ||
523 | #endif | ||
524 | |||
525 | /* | ||
526 | * Buffer requirements for NLM | ||
527 | */ | ||
528 | #define NLM4_void_sz 0 | ||
529 | #define NLM4_cookie_sz 1+XDR_QUADLEN(NLM_MAXCOOKIELEN) | ||
530 | #define NLM4_caller_sz 1+XDR_QUADLEN(NLMCLNT_OHSIZE) | ||
531 | #define NLM4_owner_sz 1+XDR_QUADLEN(NLMCLNT_OHSIZE) | ||
532 | #define NLM4_fhandle_sz 1+XDR_QUADLEN(NFS3_FHSIZE) | ||
533 | #define NLM4_lock_sz 5+NLM4_caller_sz+NLM4_owner_sz+NLM4_fhandle_sz | ||
534 | #define NLM4_holder_sz 6+NLM4_owner_sz | ||
535 | |||
536 | #define NLM4_testargs_sz NLM4_cookie_sz+1+NLM4_lock_sz | ||
537 | #define NLM4_lockargs_sz NLM4_cookie_sz+4+NLM4_lock_sz | ||
538 | #define NLM4_cancargs_sz NLM4_cookie_sz+2+NLM4_lock_sz | ||
539 | #define NLM4_unlockargs_sz NLM4_cookie_sz+NLM4_lock_sz | ||
540 | |||
541 | #define NLM4_testres_sz NLM4_cookie_sz+1+NLM4_holder_sz | ||
542 | #define NLM4_res_sz NLM4_cookie_sz+1 | ||
543 | #define NLM4_norep_sz 0 | ||
544 | |||
545 | /* | ||
546 | * For NLM, a void procedure really returns nothing | ||
547 | */ | ||
548 | #define nlm4clt_decode_norep NULL | ||
549 | |||
550 | #define PROC(proc, argtype, restype) \ | ||
551 | [NLMPROC_##proc] = { \ | ||
552 | .p_proc = NLMPROC_##proc, \ | ||
553 | .p_encode = (kxdrproc_t) nlm4clt_encode_##argtype, \ | ||
554 | .p_decode = (kxdrproc_t) nlm4clt_decode_##restype, \ | ||
555 | .p_arglen = NLM4_##argtype##_sz, \ | ||
556 | .p_replen = NLM4_##restype##_sz, \ | ||
557 | .p_statidx = NLMPROC_##proc, \ | ||
558 | .p_name = #proc, \ | ||
559 | } | ||
560 | |||
561 | static struct rpc_procinfo nlm4_procedures[] = { | ||
562 | PROC(TEST, testargs, testres), | ||
563 | PROC(LOCK, lockargs, res), | ||
564 | PROC(CANCEL, cancargs, res), | ||
565 | PROC(UNLOCK, unlockargs, res), | ||
566 | PROC(GRANTED, testargs, res), | ||
567 | PROC(TEST_MSG, testargs, norep), | ||
568 | PROC(LOCK_MSG, lockargs, norep), | ||
569 | PROC(CANCEL_MSG, cancargs, norep), | ||
570 | PROC(UNLOCK_MSG, unlockargs, norep), | ||
571 | PROC(GRANTED_MSG, testargs, norep), | ||
572 | PROC(TEST_RES, testres, norep), | ||
573 | PROC(LOCK_RES, res, norep), | ||
574 | PROC(CANCEL_RES, res, norep), | ||
575 | PROC(UNLOCK_RES, res, norep), | ||
576 | PROC(GRANTED_RES, res, norep), | ||
577 | #ifdef NLMCLNT_SUPPORT_SHARES | ||
578 | PROC(SHARE, shareargs, shareres), | ||
579 | PROC(UNSHARE, shareargs, shareres), | ||
580 | PROC(NM_LOCK, lockargs, res), | ||
581 | PROC(FREE_ALL, notify, void), | ||
582 | #endif | ||
583 | }; | ||
584 | |||
585 | struct rpc_version nlm_version4 = { | ||
586 | .number = 4, | ||
587 | .nrprocs = 24, | ||
588 | .procs = nlm4_procedures, | ||
589 | }; | ||