aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/nfs/nfs2xdr.c30
-rw-r--r--fs/nfs/nfs4xdr.c90
-rw-r--r--fs/nfsd/nfs4callback.c52
3 files changed, 86 insertions, 86 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index 70df08a84ead..0343175fe6c0 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -1193,21 +1193,21 @@ int nfs_stat_to_errno(enum nfs_stat status)
1193 .p_name = #proc, \ 1193 .p_name = #proc, \
1194 } 1194 }
1195struct rpc_procinfo nfs_procedures[] = { 1195struct rpc_procinfo nfs_procedures[] = {
1196 PROC(GETATTR, fhandle, attrstat, 1), 1196 PROC(GETATTR, fhandle, attrstat, 1),
1197 PROC(SETATTR, sattrargs, attrstat, 0), 1197 PROC(SETATTR, sattrargs, attrstat, 0),
1198 PROC(LOOKUP, diropargs, diropres, 2), 1198 PROC(LOOKUP, diropargs, diropres, 2),
1199 PROC(READLINK, readlinkargs, readlinkres, 3), 1199 PROC(READLINK, readlinkargs, readlinkres, 3),
1200 PROC(READ, readargs, readres, 3), 1200 PROC(READ, readargs, readres, 3),
1201 PROC(WRITE, writeargs, writeres, 4), 1201 PROC(WRITE, writeargs, writeres, 4),
1202 PROC(CREATE, createargs, diropres, 0), 1202 PROC(CREATE, createargs, diropres, 0),
1203 PROC(REMOVE, removeargs, stat, 0), 1203 PROC(REMOVE, removeargs, stat, 0),
1204 PROC(RENAME, renameargs, stat, 0), 1204 PROC(RENAME, renameargs, stat, 0),
1205 PROC(LINK, linkargs, stat, 0), 1205 PROC(LINK, linkargs, stat, 0),
1206 PROC(SYMLINK, symlinkargs, stat, 0), 1206 PROC(SYMLINK, symlinkargs, stat, 0),
1207 PROC(MKDIR, createargs, diropres, 0), 1207 PROC(MKDIR, createargs, diropres, 0),
1208 PROC(RMDIR, diropargs, stat, 0), 1208 PROC(RMDIR, diropargs, stat, 0),
1209 PROC(READDIR, readdirargs, readdirres, 3), 1209 PROC(READDIR, readdirargs, readdirres, 3),
1210 PROC(STATFS, fhandle, statfsres, 0), 1210 PROC(STATFS, fhandle, statfsres, 0),
1211}; 1211};
1212 1212
1213struct rpc_version nfs_version2 = { 1213struct rpc_version nfs_version2 = {
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 9f1826b012e6..a48a43c75111 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -6301,8 +6301,8 @@ nfs4_stat_to_errno(int stat)
6301#define PROC(proc, argtype, restype) \ 6301#define PROC(proc, argtype, restype) \
6302[NFSPROC4_CLNT_##proc] = { \ 6302[NFSPROC4_CLNT_##proc] = { \
6303 .p_proc = NFSPROC4_COMPOUND, \ 6303 .p_proc = NFSPROC4_COMPOUND, \
6304 .p_encode = (kxdrproc_t) nfs4_xdr_##argtype, \ 6304 .p_encode = (kxdrproc_t)nfs4_xdr_##argtype, \
6305 .p_decode = (kxdrproc_t) nfs4_xdr_##restype, \ 6305 .p_decode = (kxdrproc_t)nfs4_xdr_##restype, \
6306 .p_arglen = NFS4_##argtype##_sz, \ 6306 .p_arglen = NFS4_##argtype##_sz, \
6307 .p_replen = NFS4_##restype##_sz, \ 6307 .p_replen = NFS4_##restype##_sz, \
6308 .p_statidx = NFSPROC4_CLNT_##proc, \ 6308 .p_statidx = NFSPROC4_CLNT_##proc, \
@@ -6310,50 +6310,50 @@ nfs4_stat_to_errno(int stat)
6310} 6310}
6311 6311
6312struct rpc_procinfo nfs4_procedures[] = { 6312struct rpc_procinfo nfs4_procedures[] = {
6313 PROC(READ, enc_read, dec_read), 6313 PROC(READ, enc_read, dec_read),
6314 PROC(WRITE, enc_write, dec_write), 6314 PROC(WRITE, enc_write, dec_write),
6315 PROC(COMMIT, enc_commit, dec_commit), 6315 PROC(COMMIT, enc_commit, dec_commit),
6316 PROC(OPEN, enc_open, dec_open), 6316 PROC(OPEN, enc_open, dec_open),
6317 PROC(OPEN_CONFIRM, enc_open_confirm, dec_open_confirm), 6317 PROC(OPEN_CONFIRM, enc_open_confirm, dec_open_confirm),
6318 PROC(OPEN_NOATTR, enc_open_noattr, dec_open_noattr), 6318 PROC(OPEN_NOATTR, enc_open_noattr, dec_open_noattr),
6319 PROC(OPEN_DOWNGRADE, enc_open_downgrade, dec_open_downgrade), 6319 PROC(OPEN_DOWNGRADE, enc_open_downgrade, dec_open_downgrade),
6320 PROC(CLOSE, enc_close, dec_close), 6320 PROC(CLOSE, enc_close, dec_close),
6321 PROC(SETATTR, enc_setattr, dec_setattr), 6321 PROC(SETATTR, enc_setattr, dec_setattr),
6322 PROC(FSINFO, enc_fsinfo, dec_fsinfo), 6322 PROC(FSINFO, enc_fsinfo, dec_fsinfo),
6323 PROC(RENEW, enc_renew, dec_renew), 6323 PROC(RENEW, enc_renew, dec_renew),
6324 PROC(SETCLIENTID, enc_setclientid, dec_setclientid), 6324 PROC(SETCLIENTID, enc_setclientid, dec_setclientid),
6325 PROC(SETCLIENTID_CONFIRM, enc_setclientid_confirm, dec_setclientid_confirm), 6325 PROC(SETCLIENTID_CONFIRM, enc_setclientid_confirm, dec_setclientid_confirm),
6326 PROC(LOCK, enc_lock, dec_lock), 6326 PROC(LOCK, enc_lock, dec_lock),
6327 PROC(LOCKT, enc_lockt, dec_lockt), 6327 PROC(LOCKT, enc_lockt, dec_lockt),
6328 PROC(LOCKU, enc_locku, dec_locku), 6328 PROC(LOCKU, enc_locku, dec_locku),
6329 PROC(ACCESS, enc_access, dec_access), 6329 PROC(ACCESS, enc_access, dec_access),
6330 PROC(GETATTR, enc_getattr, dec_getattr), 6330 PROC(GETATTR, enc_getattr, dec_getattr),
6331 PROC(LOOKUP, enc_lookup, dec_lookup), 6331 PROC(LOOKUP, enc_lookup, dec_lookup),
6332 PROC(LOOKUP_ROOT, enc_lookup_root, dec_lookup_root), 6332 PROC(LOOKUP_ROOT, enc_lookup_root, dec_lookup_root),
6333 PROC(REMOVE, enc_remove, dec_remove), 6333 PROC(REMOVE, enc_remove, dec_remove),
6334 PROC(RENAME, enc_rename, dec_rename), 6334 PROC(RENAME, enc_rename, dec_rename),
6335 PROC(LINK, enc_link, dec_link), 6335 PROC(LINK, enc_link, dec_link),
6336 PROC(SYMLINK, enc_symlink, dec_symlink), 6336 PROC(SYMLINK, enc_symlink, dec_symlink),
6337 PROC(CREATE, enc_create, dec_create), 6337 PROC(CREATE, enc_create, dec_create),
6338 PROC(PATHCONF, enc_pathconf, dec_pathconf), 6338 PROC(PATHCONF, enc_pathconf, dec_pathconf),
6339 PROC(STATFS, enc_statfs, dec_statfs), 6339 PROC(STATFS, enc_statfs, dec_statfs),
6340 PROC(READLINK, enc_readlink, dec_readlink), 6340 PROC(READLINK, enc_readlink, dec_readlink),
6341 PROC(READDIR, enc_readdir, dec_readdir), 6341 PROC(READDIR, enc_readdir, dec_readdir),
6342 PROC(SERVER_CAPS, enc_server_caps, dec_server_caps), 6342 PROC(SERVER_CAPS, enc_server_caps, dec_server_caps),
6343 PROC(DELEGRETURN, enc_delegreturn, dec_delegreturn), 6343 PROC(DELEGRETURN, enc_delegreturn, dec_delegreturn),
6344 PROC(GETACL, enc_getacl, dec_getacl), 6344 PROC(GETACL, enc_getacl, dec_getacl),
6345 PROC(SETACL, enc_setacl, dec_setacl), 6345 PROC(SETACL, enc_setacl, dec_setacl),
6346 PROC(FS_LOCATIONS, enc_fs_locations, dec_fs_locations), 6346 PROC(FS_LOCATIONS, enc_fs_locations, dec_fs_locations),
6347 PROC(RELEASE_LOCKOWNER, enc_release_lockowner, dec_release_lockowner), 6347 PROC(RELEASE_LOCKOWNER, enc_release_lockowner, dec_release_lockowner),
6348#if defined(CONFIG_NFS_V4_1) 6348#if defined(CONFIG_NFS_V4_1)
6349 PROC(EXCHANGE_ID, enc_exchange_id, dec_exchange_id), 6349 PROC(EXCHANGE_ID, enc_exchange_id, dec_exchange_id),
6350 PROC(CREATE_SESSION, enc_create_session, dec_create_session), 6350 PROC(CREATE_SESSION, enc_create_session, dec_create_session),
6351 PROC(DESTROY_SESSION, enc_destroy_session, dec_destroy_session), 6351 PROC(DESTROY_SESSION, enc_destroy_session, dec_destroy_session),
6352 PROC(SEQUENCE, enc_sequence, dec_sequence), 6352 PROC(SEQUENCE, enc_sequence, dec_sequence),
6353 PROC(GET_LEASE_TIME, enc_get_lease_time, dec_get_lease_time), 6353 PROC(GET_LEASE_TIME, enc_get_lease_time, dec_get_lease_time),
6354 PROC(RECLAIM_COMPLETE, enc_reclaim_complete, dec_reclaim_complete), 6354 PROC(RECLAIM_COMPLETE, enc_reclaim_complete, dec_reclaim_complete),
6355 PROC(GETDEVICEINFO, enc_getdeviceinfo, dec_getdeviceinfo), 6355 PROC(GETDEVICEINFO, enc_getdeviceinfo, dec_getdeviceinfo),
6356 PROC(LAYOUTGET, enc_layoutget, dec_layoutget), 6356 PROC(LAYOUTGET, enc_layoutget, dec_layoutget),
6357#endif /* CONFIG_NFS_V4_1 */ 6357#endif /* CONFIG_NFS_V4_1 */
6358}; 6358};
6359 6359
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)
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-02 06:34:38 -0500