aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4callback.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-12-14 09:57:42 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-12-16 12:37:24 -0500
commit7d93bd71cb3e2629cc88bc59f393bd4df4162b94 (patch)
tree0280f34e564ed29589026845fa2fba49eb7e9d17 /fs/nfsd/nfs4callback.c
parent85a56480191ca9f08fc775c129b9eb5c8c1f2c05 (diff)
NFS: Repair whitespace damage in NFS PROC macro
Clean up. When I was making other changes in this area, checkscript.pl complained about the use of leading blanks in the PROC macros in the xdr files. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Tested-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
-rw-r--r--fs/nfsd/nfs4callback.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index c3c6a903144c..6529534d7aae 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -580,23 +580,23 @@ out_default:
580/* 580/*
581 * RPC procedure tables 581 * RPC procedure tables
582 */ 582 */
583#define PROC(proc, call, argtype, restype) \ 583#define PROC(proc, call, argtype, restype) \
584[NFSPROC4_CLNT_##proc] = { \ 584[NFSPROC4_CLNT_##proc] = { \
585 .p_proc = NFSPROC4_CB_##call, \ 585 .p_proc = NFSPROC4_CB_##call, \
586 .p_encode = (kxdrproc_t) nfs4_xdr_##argtype, \ 586 .p_encode = (kxdrproc_t)nfs4_xdr_enc_##argtype, \
587 .p_decode = (kxdrproc_t) nfs4_xdr_##restype, \ 587 .p_decode = (kxdrproc_t)nfs4_xdr_dec_##restype, \
588 .p_arglen = NFS4_##argtype##_sz, \ 588 .p_arglen = NFS4_enc_##argtype##_sz, \
589 .p_replen = NFS4_##restype##_sz, \ 589 .p_replen = NFS4_dec_##restype##_sz, \
590 .p_statidx = NFSPROC4_CB_##call, \ 590 .p_statidx = NFSPROC4_CB_##call, \
591 .p_name = #proc, \ 591 .p_name = #proc, \
592} 592}
593 593
594static struct rpc_procinfo nfs4_cb_procedures[] = { 594static struct rpc_procinfo nfs4_cb_procedures[] = {
595 PROC(CB_NULL, NULL, enc_cb_null, dec_cb_null), 595 PROC(CB_NULL, NULL, cb_null, cb_null),
596 PROC(CB_RECALL, COMPOUND, enc_cb_recall, dec_cb_recall), 596 PROC(CB_RECALL, COMPOUND, cb_recall, cb_recall),
597}; 597};
598 598
599static struct rpc_version nfs_cb_version4 = { 599static struct rpc_version nfs_cb_version4 = {
600/* 600/*
601 * Note on the callback rpc program version number: despite language in rfc 601 * Note on the callback rpc program version number: despite language in rfc
602 * 5661 section 18.36.3 requiring servers to use 4 in this field, the 602 * 5661 section 18.36.3 requiring servers to use 4 in this field, the
@@ -604,29 +604,29 @@ static struct rpc_version nfs_cb_version4 = {
604 * in practice that appears to be what implementations use. The section 604 * in practice that appears to be what implementations use. The section
605 * 18.36.3 language is expected to be fixed in an erratum. 605 * 18.36.3 language is expected to be fixed in an erratum.
606 */ 606 */
607 .number = 1, 607 .number = 1,
608 .nrprocs = ARRAY_SIZE(nfs4_cb_procedures), 608 .nrprocs = ARRAY_SIZE(nfs4_cb_procedures),
609 .procs = nfs4_cb_procedures 609 .procs = nfs4_cb_procedures
610}; 610};
611 611
612static struct rpc_version * nfs_cb_version[] = { 612static struct rpc_version *nfs_cb_version[] = {
613 &nfs_cb_version4, 613 &nfs_cb_version4,
614}; 614};
615 615
616static struct rpc_program cb_program; 616static struct rpc_program cb_program;
617 617
618static struct rpc_stat cb_stats = { 618static struct rpc_stat cb_stats = {
619 .program = &cb_program 619 .program = &cb_program
620}; 620};
621 621
622#define NFS4_CALLBACK 0x40000000 622#define NFS4_CALLBACK 0x40000000
623static struct rpc_program cb_program = { 623static struct rpc_program cb_program = {
624 .name = "nfs4_cb", 624 .name = "nfs4_cb",
625 .number = NFS4_CALLBACK, 625 .number = NFS4_CALLBACK,
626 .nrvers = ARRAY_SIZE(nfs_cb_version), 626 .nrvers = ARRAY_SIZE(nfs_cb_version),
627 .version = nfs_cb_version, 627 .version = nfs_cb_version,
628 .stats = &cb_stats, 628 .stats = &cb_stats,
629 .pipe_dir_name = "/nfsd4_cb", 629 .pipe_dir_name = "/nfsd4_cb",
630}; 630};
631 631
632static int max_cb_time(void) 632static int max_cb_time(void)