draft-ietf-nfsv4-minorversion2-dot-x-23.txt   draft-ietf-nfsv4-minorversion2-dot-x-24.txt 
NFSv4 T. Haynes NFSv4 T. Haynes
Internet-Draft Primary Data Internet-Draft Primary Data
Intended status: Standards Track April 29, 2014 Intended status: Standards Track May 17, 2014
Expires: October 31, 2014 Expires: November 18, 2014
NFSv4 Minor Version 2 Protocol External Data Representation Standard NFSv4 Minor Version 2 Protocol External Data Representation Standard
(XDR) Description (XDR) Description
draft-ietf-nfsv4-minorversion2-dot-x-23.txt draft-ietf-nfsv4-minorversion2-dot-x-24.txt
Abstract Abstract
This Internet-Draft provides the XDR description for NFSv4 minor This Internet-Draft provides the XDR description for NFSv4 minor
version two. version two.
Requirements Language Requirements Language
The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
skipping to change at page 1, line 38 skipping to change at page 1, line 38
Internet-Drafts are working documents of the Internet Engineering Internet-Drafts are working documents of the Internet Engineering
Task Force (IETF). Note that other groups may also distribute Task Force (IETF). Note that other groups may also distribute
working documents as Internet-Drafts. The list of current Internet- working documents as Internet-Drafts. The list of current Internet-
Drafts is at http://datatracker.ietf.org/drafts/current/. Drafts is at http://datatracker.ietf.org/drafts/current/.
Internet-Drafts are draft documents valid for a maximum of six months Internet-Drafts are draft documents valid for a maximum of six months
and may be updated, replaced, or obsoleted by other documents at any and may be updated, replaced, or obsoleted by other documents at any
time. It is inappropriate to use Internet-Drafts as reference time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress." material or to cite them other than as "work in progress."
This Internet-Draft will expire on October 31, 2014. This Internet-Draft will expire on November 18, 2014.
Copyright Notice Copyright Notice
Copyright (c) 2014 IETF Trust and the persons identified as the Copyright (c) 2014 IETF Trust and the persons identified as the
document authors. All rights reserved. document authors. All rights reserved.
This document is subject to BCP 78 and the IETF Trust's Legal This document is subject to BCP 78 and the IETF Trust's Legal
Provisions Relating to IETF Documents Provisions Relating to IETF Documents
(http://trustee.ietf.org/license-info) in effect on the date of (http://trustee.ietf.org/license-info) in effect on the date of
publication of this document. Please review these documents publication of this document. Please review these documents
skipping to change at page 2, line 16 skipping to change at page 2, line 16
the Trust Legal Provisions and are provided without warranty as the Trust Legal Provisions and are provided without warranty as
described in the Simplified BSD License. described in the Simplified BSD License.
Table of Contents Table of Contents
1. XDR Description of NFSv4.2 . . . . . . . . . . . . . . . . . 2 1. XDR Description of NFSv4.2 . . . . . . . . . . . . . . . . . 2
2. Security Considerations . . . . . . . . . . . . . . . . . . . 79 2. Security Considerations . . . . . . . . . . . . . . . . . . . 79
3. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 79 3. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 79
4. Normative References . . . . . . . . . . . . . . . . . . . . 79 4. Normative References . . . . . . . . . . . . . . . . . . . . 79
Appendix A. Acknowledgments . . . . . . . . . . . . . . . . . . 79 Appendix A. Acknowledgments . . . . . . . . . . . . . . . . . . 79
Appendix B. RFC Editor Notes . . . . . . . . . . . . . . . . . . 80 Appendix B. RFC Editor Notes . . . . . . . . . . . . . . . . . . 79
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 80 Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 79
1. XDR Description of NFSv4.2 1. XDR Description of NFSv4.2
This document contains the XDR ([RFC4506]) description of NFSv4.2 This document contains the XDR ([RFC4506]) description of NFSv4.2
protocol ([NFSv42]). In order to facilitate implementations that protocol ([NFSv42]). In order to facilitate implementations that
support all of NFSv4.0, NFSv4.1, and NFSv4.2, the description support all of NFSv4.0, NFSv4.1, and NFSv4.2, the description
includes operations, and other features of NFSv4.0 and NFSv4.1 that includes operations, and other features of NFSv4.0 and NFSv4.1 that
do not apply to NFSv4.2. do not apply to NFSv4.2.
The XDR description is provided in this document in a way that makes The XDR description is provided in this document in a way that makes
skipping to change at page 2, line 48 skipping to change at page 2, line 48
sh extract.sh < spec.txt > nfs4_prot.x sh extract.sh < spec.txt > nfs4_prot.x
The effect of the script is to remove leading white space from each The effect of the script is to remove leading white space from each
line, plus a sentinel sequence of "///". line, plus a sentinel sequence of "///".
The XDR description, with the sentinel sequence follows: The XDR description, with the sentinel sequence follows:
/// /* /// /*
/// * This file was machine generated for /// * This file was machine generated for
/// * draft-ietf-nfsv4-minorversion2-23 /// * draft-ietf-nfsv4-minorversion2-24
/// * Last updated Tue Apr 29 14:45:32 PDT 2014 /// * Last updated Sat May 17 22:25:20 CDT 2014
/// */ /// */
/// /* /// /*
/// * Copyright (C) The IETF Trust (2007-2014) /// * Copyright (C) The IETF Trust (2007-2014)
/// * All Rights Reserved. /// * All Rights Reserved.
/// * /// *
/// * Copyright (C) The Internet Society (1998-2006). /// * Copyright (C) The Internet Society (1998-2006).
/// * All Rights Reserved. /// * All Rights Reserved.
/// */ /// */
/// ///
/// /* /// /*
skipping to change at page 7, line 5 skipping to change at page 7, line 5
/// NFS4ERR_RETURNCONFLICT = 10086,/* layout get before return*/ /// NFS4ERR_RETURNCONFLICT = 10086,/* layout get before return*/
/// NFS4ERR_DELEG_REVOKED = 10087,/* deleg./layout revoked */ /// NFS4ERR_DELEG_REVOKED = 10087,/* deleg./layout revoked */
/// ///
/// /* NFSv4.2 errors start here. */ /// /* NFSv4.2 errors start here. */
/// ///
/// NFS4ERR_PARTNER_NOTSUPP= 10088,/* s2s not supported */ /// NFS4ERR_PARTNER_NOTSUPP= 10088,/* s2s not supported */
/// NFS4ERR_PARTNER_NO_AUTH= 10089,/* s2s not authorized */ /// NFS4ERR_PARTNER_NO_AUTH= 10089,/* s2s not authorized */
/// NFS4ERR_UNION_NOTSUPP = 10090,/* Arm of union not supp */ /// NFS4ERR_UNION_NOTSUPP = 10090,/* Arm of union not supp */
/// NFS4ERR_OFFLOAD_DENIED = 10091,/* dest not allowing copy */ /// NFS4ERR_OFFLOAD_DENIED = 10091,/* dest not allowing copy */
/// NFS4ERR_WRONG_LFS = 10092,/* LFS not supported */ /// NFS4ERR_WRONG_LFS = 10092,/* LFS not supported */
/// NFS4ERR_BADLABEL = 10093 /* incorrect label */ /// NFS4ERR_BADLABEL = 10093,/* incorrect label */
/// NFS4ERR_OFFLOAD_NO_REQS= 10094 /* dest not meeting reqs */
/// }; /// };
/// ///
/// /* /// /*
/// * Basic data types /// * Basic data types
/// */ /// */
/// typedef opaque attrlist4<>; /// typedef opaque attrlist4<>;
/// typedef uint32_t bitmap4<>; /// typedef uint32_t bitmap4<>;
/// typedef uint64_t changeid4; /// typedef uint64_t changeid4;
/// typedef uint64_t clientid4; /// typedef uint64_t clientid4;
/// typedef uint32_t count4; /// typedef uint32_t count4;
skipping to change at page 7, line 38 skipping to change at page 7, line 39
/// typedef utf8string utf8str_cis; /// typedef utf8string utf8str_cis;
/// typedef utf8string utf8str_cs; /// typedef utf8string utf8str_cs;
/// typedef utf8string utf8str_mixed; /// typedef utf8string utf8str_mixed;
/// typedef utf8str_cs component4; /// typedef utf8str_cs component4;
/// typedef opaque linktext4<>; /// typedef opaque linktext4<>;
/// typedef utf8string ascii_REQUIRED4; /// typedef utf8string ascii_REQUIRED4;
/// typedef component4 pathname4<>; /// typedef component4 pathname4<>;
/// typedef opaque verifier4[NFS4_VERIFIER_SIZE]; /// typedef opaque verifier4[NFS4_VERIFIER_SIZE];
/// typedef string secret4<>; /// typedef string secret4<>;
/// typedef uint32_t policy4; /// typedef uint32_t policy4;
/// typedef uint64_t change_sec_label4;
/// ///
/// /* /// /*
/// * Timeval /// * Timeval
/// */ /// */
/// struct nfstime4 { /// struct nfstime4 {
/// int64_t seconds; /// int64_t seconds;
/// uint32_t nseconds; /// uint32_t nseconds;
/// }; /// };
/// ///
/// enum time_how4 { /// enum time_how4 {
skipping to change at page 18, line 5 skipping to change at page 18, line 5
/// length4 adb_block_count; /// length4 adb_block_count;
/// length4 adb_reloff_blocknum; /// length4 adb_reloff_blocknum;
/// count4 adb_block_num; /// count4 adb_block_num;
/// length4 adb_reloff_pattern; /// length4 adb_reloff_pattern;
/// opaque adb_pattern<>; /// opaque adb_pattern<>;
/// }; /// };
/// ///
/// ///
/// struct data4 { /// struct data4 {
/// offset4 d_offset; /// offset4 d_offset;
/// bool d_allocated;
/// opaque d_data<>; /// opaque d_data<>;
/// }; /// };
/// ///
/// enum space_info4 {
/// SPACE_RESERVED4 = 0,
/// SPACE_UNRESERVED4 = 1,
/// SPACE_UNKNOWN4 = 2
/// };
///
/// struct data_info4 { /// struct data_info4 {
/// offset4 di_offset; /// offset4 di_offset;
/// length4 di_length; /// length4 di_length;
/// space_info4 di_reserved;
/// }; /// };
/// ///
/// ///
/// /* /// /*
/// * Use an enum such that we can extend new types. /// * Use an enum such that we can extend new types.
/// */ /// */
/// enum data_content4 { /// enum data_content4 {
/// NFS4_CONTENT_DATA = 0, /// NFS4_CONTENT_DATA = 0,
/// NFS4_CONTENT_HOLE = 1 /// NFS4_CONTENT_HOLE = 1
/// }; /// };
skipping to change at page 22, line 42 skipping to change at page 22, line 34
/// const FATTR4_LAYOUT_ALIGNMENT = 66; /// const FATTR4_LAYOUT_ALIGNMENT = 66;
/// const FATTR4_FS_LOCATIONS_INFO = 67; /// const FATTR4_FS_LOCATIONS_INFO = 67;
/// const FATTR4_MDSTHRESHOLD = 68; /// const FATTR4_MDSTHRESHOLD = 68;
/// const FATTR4_RETENTION_GET = 69; /// const FATTR4_RETENTION_GET = 69;
/// const FATTR4_RETENTION_SET = 70; /// const FATTR4_RETENTION_SET = 70;
/// const FATTR4_RETENTEVT_GET = 71; /// const FATTR4_RETENTEVT_GET = 71;
/// const FATTR4_RETENTEVT_SET = 72; /// const FATTR4_RETENTEVT_SET = 72;
/// const FATTR4_RETENTION_HOLD = 73; /// const FATTR4_RETENTION_HOLD = 73;
/// const FATTR4_MODE_SET_MASKED = 74; /// const FATTR4_MODE_SET_MASKED = 74;
/// const FATTR4_FS_CHARSET_CAP = 76; /// const FATTR4_FS_CHARSET_CAP = 76;
/// const FATTR4_CHANGE_SEC_LABEL = 77; /// const FATTR4_SPACE_FREED = 77;
/// const FATTR4_SPACE_FREED = 78; /// const FATTR4_CHANGE_ATTR_TYPE = 78;
/// const FATTR4_CHANGE_ATTR_TYPE = 79; /// const FATTR4_SEC_LABEL = 79;
/// const FATTR4_SEC_LABEL = 80;
/// ///
/// /* /// /*
/// * File attribute container /// * File attribute container
/// */ /// */
/// struct fattr4 { /// struct fattr4 {
/// bitmap4 attrmask; /// bitmap4 attrmask;
/// attrlist4 attr_vals; /// attrlist4 attr_vals;
/// }; /// };
/// ///
/// /* /// /*
skipping to change at page 58, line 33 skipping to change at page 58, line 24
/// }; /// };
/// ///
/// struct COPY4args { /// struct COPY4args {
/// /* SAVED_FH: source file */ /// /* SAVED_FH: source file */
/// /* CURRENT_FH: destination file */ /// /* CURRENT_FH: destination file */
/// stateid4 ca_src_stateid; /// stateid4 ca_src_stateid;
/// stateid4 ca_dst_stateid; /// stateid4 ca_dst_stateid;
/// offset4 ca_src_offset; /// offset4 ca_src_offset;
/// offset4 ca_dst_offset; /// offset4 ca_dst_offset;
/// length4 ca_count; /// length4 ca_count;
/// bool ca_consecutive;
/// bool ca_synchronous;
/// netloc4 ca_source_server<>; /// netloc4 ca_source_server<>;
/// }; /// };
/// ///
/// union COPY4res switch (nfsstat4 cr_status) {
/// case NFS4_OK:
/// write_response4 resok4;
/// default:
/// length4 cr_bytes_copied;
/// };
/// ///
/// struct OFFLOAD_ABORT4args { /// struct COPY4res {
/// /* CURRENT_FH: destination file */ /// nfsstat4 cr_status;
/// stateid4 oaa_stateid; /// write_response4 cr_response;
/// bool cr_consecutive;
/// bool cr_synchronous;
/// }; /// };
/// ///
/// struct OFFLOAD_ABORT4res {
/// nfsstat4 oar_status;
/// };
/// ///
/// struct COPY_NOTIFY4args { /// struct COPY_NOTIFY4args {
/// /* CURRENT_FH: source file */ /// /* CURRENT_FH: source file */
/// stateid4 cna_src_stateid; /// stateid4 cna_src_stateid;
/// netloc4 cna_destination_server; /// netloc4 cna_destination_server;
/// }; /// };
/// ///
/// struct COPY_NOTIFY4resok { /// struct COPY_NOTIFY4resok {
/// nfstime4 cnr_lease_time; /// nfstime4 cnr_lease_time;
/// netloc4 cnr_source_server<>; /// netloc4 cnr_source_server<>;
/// }; /// };
/// ///
/// union COPY_NOTIFY4res switch (nfsstat4 cnr_status) { /// union COPY_NOTIFY4res switch (nfsstat4 cnr_status) {
/// case NFS4_OK: /// case NFS4_OK:
/// COPY_NOTIFY4resok resok4; /// COPY_NOTIFY4resok resok4;
/// default: /// default:
/// void; /// void;
/// }; /// };
/// ///
/// struct OFFLOAD_REVOKE4args { /// struct OFFLOAD_CANCEL4args {
/// /* CURRENT_FH: source file */ /// /* CURRENT_FH: source file */
/// netloc4 ora_destination_server; /// stateid4 oca_stateid;
/// }; /// };
/// ///
/// struct OFFLOAD_REVOKE4res { /// struct OFFLOAD_CANCEL4res {
/// nfsstat4 orr_status; /// nfsstat4 ocr_status;
/// }; /// };
/// ///
/// ///
/// struct OFFLOAD_STATUS4args { /// struct OFFLOAD_STATUS4args {
/// /* CURRENT_FH: destination file */ /// /* CURRENT_FH: destination file */
/// stateid4 osa_stateid; /// stateid4 osa_stateid;
/// }; /// };
/// ///
/// struct OFFLOAD_STATUS4resok { /// struct OFFLOAD_STATUS4resok {
/// length4 osr_bytes_copied; /// length4 osr_count;
/// nfsstat4 osr_complete<1>; /// nfsstat4 osr_complete<1>;
/// }; /// };
/// ///
/// union OFFLOAD_STATUS4res switch (nfsstat4 osr_status) { /// union OFFLOAD_STATUS4res switch (nfsstat4 osr_status) {
/// case NFS4_OK: /// case NFS4_OK:
/// OFFLOAD_STATUS4resok osr_resok4; /// OFFLOAD_STATUS4resok osr_resok4;
/// default: /// default:
/// void; /// void;
/// }; /// };
/// ///
/// struct ALLOCATE4args { /// struct ALLOCATE4args {
/// /* CURRENT_FH: file */ /// /* CURRENT_FH: file */
/// stateid4 aa_stateid; /// stateid4 aa_stateid;
/// offset4 aa_offset; /// offset4 aa_offset;
/// length4 aa_length; /// length4 aa_length;
/// }; /// };
/// struct ALLOCATE4res { /// struct ALLOCATE4res {
/// nfsstat4 ar_status; /// nfsstat4 ar_status;
/// }; /// };
/// ///
/// struct DEALLOCATE4args { /// struct DEALLOCATE4args {
/// /* CURRENT_FH: file */ /// /* CURRENT_FH: file */
/// stateid4 da_stateid; /// stateid4 da_stateid;
/// offset4 da_offset; /// offset4 da_offset;
/// length4 da_length; /// length4 da_length;
/// }; /// };
/// ///
///
/// struct DEALLOCATE4res { /// struct DEALLOCATE4res {
/// nfsstat4 dr_status; /// nfsstat4 dr_status;
/// }; /// };
/// enum IO_ADVISE_type4 { /// enum IO_ADVISE_type4 {
/// IO_ADVISE4_NORMAL = 0, /// IO_ADVISE4_NORMAL = 0,
/// IO_ADVISE4_SEQUENTIAL = 1, /// IO_ADVISE4_SEQUENTIAL = 1,
/// IO_ADVISE4_SEQUENTIAL_BACKWARDS = 2, /// IO_ADVISE4_SEQUENTIAL_BACKWARDS = 2,
/// IO_ADVISE4_RANDOM = 3, /// IO_ADVISE4_RANDOM = 3,
/// IO_ADVISE4_WILLNEED = 4, /// IO_ADVISE4_WILLNEED = 4,
/// IO_ADVISE4_WILLNEED_OPPORTUNISTIC = 5, /// IO_ADVISE4_WILLNEED_OPPORTUNISTIC = 5,
/// IO_ADVISE4_DONTNEED = 6, /// IO_ADVISE4_DONTNEED = 6,
/// IO_ADVISE4_NOREUSE = 7, /// IO_ADVISE4_NOREUSE = 7,
/// IO_ADVISE4_READ = 8, /// IO_ADVISE4_READ = 8,
/// IO_ADVISE4_WRITE = 9, /// IO_ADVISE4_WRITE = 9,
/// IO_ADVISE4_INIT_PROXIMITY = 10 /// IO_ADVISE4_INIT_PROXIMITY = 10
/// }; /// };
/// ///
/// struct IO_ADVISE4args { /// struct IO_ADVISE4args {
/// /* CURRENT_FH: file */ /// /* CURRENT_FH: file */
/// stateid4 iar_stateid; /// stateid4 iaa_stateid;
/// offset4 iar_offset; /// offset4 iaa_offset;
/// length4 iar_count; /// length4 iaa_count;
/// bitmap4 iar_hints; /// bitmap4 iaa_hints;
/// }; /// };
/// ///
/// struct IO_ADVISE4resok { /// struct IO_ADVISE4resok {
/// bitmap4 ior_hints; /// bitmap4 ior_hints;
/// }; /// };
/// ///
/// union IO_ADVISE4res switch (nfsstat4 _status) { /// union IO_ADVISE4res switch (nfsstat4 ior_status) {
/// case NFS4_OK: /// case NFS4_OK:
/// IO_ADVISE4resok resok4; /// IO_ADVISE4resok resok4;
/// default: /// default:
/// void; /// void;
/// }; /// };
/// ///
///
/// struct device_error4 {
/// deviceid4 de_deviceid;
/// nfsstat4 de_status;
/// nfs_opnum4 de_opnum;
/// };
///
///
/// struct LAYOUTERROR4args {
/// /* CURRENT_FH: file */
/// offset4 lea_offset;
/// length4 lea_length;
/// stateid4 lea_stateid;
/// device_error4 lea_errors;
/// };
///
/// struct LAYOUTERROR4res {
/// nfsstat4 ler_status;
/// };
///
/// struct io_info4 {
/// uint32_t ii_count;
/// uint64_t ii_bytes;
/// };
///
/// struct LAYOUTSTATS4args {
/// /* CURRENT_FH: file */
/// offset4 lsa_offset;
/// length4 lsa_length;
/// stateid4 lsa_stateid;
/// io_info4 lsa_read;
/// io_info4 lsa_write;
/// layoutupdate4 lsa_layoutupdate;
/// };
///
/// struct LAYOUTSTATS4res {
/// nfsstat4 lsr_status;
/// };
///
/// struct READ_PLUS4args { /// struct READ_PLUS4args {
/// /* CURRENT_FH: file */ /// /* CURRENT_FH: file */
/// stateid4 rpa_stateid; /// stateid4 rpa_stateid;
/// offset4 rpa_offset; /// offset4 rpa_offset;
/// count4 rpa_count; /// count4 rpa_count;
/// }; /// };
///
/// union read_plus_content switch (data_content4 rpc_content) { /// union read_plus_content switch (data_content4 rpc_content) {
/// case NFS4_CONTENT_DATA: /// case NFS4_CONTENT_DATA:
/// data4 rpc_data; /// data4 rpc_data;
/// case NFS4_CONTENT_HOLE: /// case NFS4_CONTENT_HOLE:
/// data_info4 rpc_hole; /// data_info4 rpc_hole;
/// default: /// default:
/// void; /// void;
/// }; /// };
/// ///
/// /* /// /*
skipping to change at page 61, line 43 skipping to change at page 62, line 20
/// default: /// default:
/// void; /// void;
/// }; /// };
/// ///
/// struct SEEK4args { /// struct SEEK4args {
/// /* CURRENT_FH: file */ /// /* CURRENT_FH: file */
/// stateid4 sa_stateid; /// stateid4 sa_stateid;
/// offset4 sa_offset; /// offset4 sa_offset;
/// data_content4 sa_what; /// data_content4 sa_what;
/// }; /// };
///
/// union seek_content switch (data_content4 content) {
/// case NFS4_CONTENT_DATA:
/// data_info4 sc_data;
/// case NFS4_CONTENT_HOLE:
/// data_info4 sc_hole;
/// default:
/// void;
/// };
///
/// struct seek_res4 { /// struct seek_res4 {
/// bool sr_eof; /// bool sr_eof;
/// seek_content sr_contents; /// offset4 sr_offset;
/// }; /// };
/// /// union SEEK4res switch (nfsstat4 sa_status) {
/// union SEEK4res switch (nfsstat4 status) {
/// case NFS4_OK: /// case NFS4_OK:
/// seek_res4 resok4; /// seek_res4 resok4;
/// default: /// default:
/// void; /// void;
/// }; /// };
/// ///
/// struct WRITE_SAME4args { /// struct WRITE_SAME4args {
/// /* CURRENT_FH: file */ /// /* CURRENT_FH: file */
/// stateid4 ws_stateid; /// stateid4 wsa_stateid;
/// stable_how4 ws_stable; /// stable_how4 wsa_stable;
/// app_data_block4 ws_adb; /// app_data_block4 wsa_adb;
/// }; /// };
/// ///
/// ///
/// union WRITE_SAME4res switch (nfsstat4 ws_status) { /// union WRITE_SAME4res switch (nfsstat4 wsr_status) {
/// case NFS4_OK: /// case NFS4_OK:
/// write_response4 ws_resok4; /// write_response4 resok4;
/// default: /// default:
/// void; /// void;
/// }; /// };
/// ///
/// ///
/// /* /// /*
/// * Operation arrays /// * Operation arrays
/// */ /// */
/// ///
/// enum nfs_opnum4 { /// enum nfs_opnum4 {
skipping to change at page 64, line 9 skipping to change at page 64, line 23
/// OP_DESTROY_CLIENTID = 57, /// OP_DESTROY_CLIENTID = 57,
/// OP_RECLAIM_COMPLETE = 58, /// OP_RECLAIM_COMPLETE = 58,
/// % /// %
/// %/* new operations for NFSv4.2 */ /// %/* new operations for NFSv4.2 */
/// % /// %
/// OP_ALLOCATE = 59, /// OP_ALLOCATE = 59,
/// OP_COPY = 60, /// OP_COPY = 60,
/// OP_COPY_NOTIFY = 61, /// OP_COPY_NOTIFY = 61,
/// OP_DEALLOCATE = 62, /// OP_DEALLOCATE = 62,
/// OP_IO_ADVISE = 63, /// OP_IO_ADVISE = 63,
/// OP_OFFLOAD_ABORT = 64, /// OP_LAYOUTERROR = 64,
/// OP_OFFLOAD_REVOKE = 65, /// OP_LAYOUTSTATS = 65,
/// OP_OFFLOAD_STATUS = 66, /// OP_OFFLOAD_CANCEL = 66,
/// OP_READ_PLUS = 67, /// OP_OFFLOAD_STATUS = 67,
/// OP_SEEK = 68, /// OP_READ_PLUS = 68,
/// OP_WRITE_SAME = 69, /// OP_SEEK = 69,
/// OP_WRITE_SAME = 70,
/// OP_ILLEGAL = 10044 /// OP_ILLEGAL = 10044
/// }; /// };
/// ///
/// union nfs_argop4 switch (nfs_opnum4 argop) { /// union nfs_argop4 switch (nfs_opnum4 argop) {
/// case OP_ACCESS: ACCESS4args opaccess; /// case OP_ACCESS: ACCESS4args opaccess;
/// case OP_CLOSE: CLOSE4args opclose; /// case OP_CLOSE: CLOSE4args opclose;
/// case OP_COMMIT: COMMIT4args opcommit; /// case OP_COMMIT: COMMIT4args opcommit;
/// case OP_CREATE: CREATE4args opcreate; /// case OP_CREATE: CREATE4args opcreate;
/// case OP_DELEGPURGE: DELEGPURGE4args opdelegpurge; /// case OP_DELEGPURGE: DELEGPURGE4args opdelegpurge;
/// case OP_DELEGRETURN: DELEGRETURN4args opdelegreturn; /// case OP_DELEGRETURN: DELEGRETURN4args opdelegreturn;
skipping to change at page 66, line 25 skipping to change at page 66, line 41
/// ///
/// case OP_DESTROY_CLIENTID: /// case OP_DESTROY_CLIENTID:
/// DESTROY_CLIENTID4args /// DESTROY_CLIENTID4args
/// opdestroy_clientid; /// opdestroy_clientid;
/// ///
/// case OP_RECLAIM_COMPLETE: /// case OP_RECLAIM_COMPLETE:
/// RECLAIM_COMPLETE4args /// RECLAIM_COMPLETE4args
/// opreclaim_complete; /// opreclaim_complete;
/// ///
/// /* Operations new to NFSv4.2 */ /// /* Operations new to NFSv4.2 */
/// case OP_COPY_NOTIFY: COPY_NOTIFY4args opoffload_notify; /// case OP_ALLOCATE: ALLOCATE4args opallocate;
/// case OP_OFFLOAD_REVOKE: OFFLOAD_REVOKE4args opcopy_revoke;
/// case OP_COPY: COPY4args opcopy; /// case OP_COPY: COPY4args opcopy;
/// case OP_OFFLOAD_ABORT: OFFLOAD_ABORT4args opoffload_abort; /// case OP_COPY_NOTIFY: COPY_NOTIFY4args opoffload_notify;
/// case OP_DEALLOCATE: DEALLOCATE4args opdeallocate;
/// case OP_IO_ADVISE: IO_ADVISE4args opio_advise;
/// case OP_LAYOUTERROR: LAYOUTERRORargs4 oplayouterror;
/// case OP_LAYOUTSTATS: LAYOUTSTATSargs4 oplayoutstats;
/// case OP_OFFLOAD_CANCEL: OFFLOAD_CANCEL4args opoffload_cancel;
/// case OP_OFFLOAD_STATUS: OFFLOAD_STATUS4args opoffload_status; /// case OP_OFFLOAD_STATUS: OFFLOAD_STATUS4args opoffload_status;
/// case OP_READ_PLUS: READ_PLUS4args opread_plus; /// case OP_READ_PLUS: READ_PLUS4args opread_plus;
/// case OP_SEEK: SEEK4args opseek; /// case OP_SEEK: SEEK4args opseek;
/// case OP_IO_ADVISE: IO_ADVISE4args opio_advise;
/// case OP_WRITE_SAME: WRITE_SAME4args opwrite_same; /// case OP_WRITE_SAME: WRITE_SAME4args opwrite_same;
/// case OP_ALLOCATE: ALLOCATE4args opallocate;
/// case OP_DEALLOCATE: DEALLOCATE4args opdeallocate;
/// ///
/// /* Operations not new to NFSv4.1 */ /// /* Operations not new to NFSv4.1 */
/// case OP_ILLEGAL: void; /// case OP_ILLEGAL: void;
/// }; /// };
/// ///
/// union nfs_resop4 switch (nfs_opnum4 resop) { /// union nfs_resop4 switch (nfs_opnum4 resop) {
/// case OP_ACCESS: ACCESS4res opaccess; /// case OP_ACCESS: ACCESS4res opaccess;
/// case OP_CLOSE: CLOSE4res opclose; /// case OP_CLOSE: CLOSE4res opclose;
/// case OP_COMMIT: COMMIT4res opcommit; /// case OP_COMMIT: COMMIT4res opcommit;
/// case OP_CREATE: CREATE4res opcreate; /// case OP_CREATE: CREATE4res opcreate;
skipping to change at page 69, line 4 skipping to change at page 69, line 21
/// ///
/// case OP_WANT_DELEGATION: /// case OP_WANT_DELEGATION:
/// WANT_DELEGATION4res /// WANT_DELEGATION4res
/// opwant_delegation; /// opwant_delegation;
/// ///
/// case OP_DESTROY_CLIENTID: /// case OP_DESTROY_CLIENTID:
/// DESTROY_CLIENTID4res /// DESTROY_CLIENTID4res
/// opdestroy_clientid; /// opdestroy_clientid;
/// ///
/// case OP_RECLAIM_COMPLETE: /// case OP_RECLAIM_COMPLETE:
/// RECLAIM_COMPLETE4res /// RECLAIM_COMPLETE4res
/// opreclaim_complete; /// opreclaim_complete;
/// ///
/// /* Operations new to NFSv4.2 */ /// /* Operations new to NFSv4.2 */
/// case OP_COPY_NOTIFY: COPY_NOTIFY4res opcopy_notify; /// case OP_ALLOCATE: ALLOCATE4res opallocate;
/// case OP_OFFLOAD_REVOKE: OFFLOAD_REVOKE4res opoffload_revoke;
/// case OP_COPY: COPY4res opcopy; /// case OP_COPY: COPY4res opcopy;
/// case OP_OFFLOAD_ABORT: OFFLOAD_ABORT4res opoffload_abort; /// case OP_COPY_NOTIFY: COPY_NOTIFY4res opcopy_notify;
/// case OP_DEALLOCATE: DEALLOCATE4res opdeallocate;
/// case OP_IO_ADVISE: IO_ADVISE4res opio_advise;
/// case OP_LAYOUTERROR: LAYOUTERROR4res oplayouterror;
/// case OP_LAYOUTSTATS: LAYOUTSTATS4res oplayputstats;
/// case OP_OFFLOAD_CANCEL: OFFLOAD_CANCEL4res opoffload_cancel;
/// case OP_OFFLOAD_STATUS: OFFLOAD_STATUS4res opoffload_status; /// case OP_OFFLOAD_STATUS: OFFLOAD_STATUS4res opoffload_status;
/// case OP_READ_PLUS: READ_PLUS4res opread_plus; /// case OP_READ_PLUS: READ_PLUS4res opread_plus;
/// case OP_SEEK: SEEK4res opseek; /// case OP_SEEK: SEEK4res opseek;
/// case OP_IO_ADVISE: IO_ADVISE4res opio_advise;
/// case OP_WRITE_SAME: WRITE_SAME4res opwrite_same; /// case OP_WRITE_SAME: WRITE_SAME4res opwrite_same;
/// case OP_ALLOCATE: ALLOCATE4res opallocate;
/// case OP_DEALLOCATE: DEALLOCATE4res opdeallocate;
/// ///
/// /* Operations not new to NFSv4.1 */ /// /* Operations not new to NFSv4.1 */
/// case OP_ILLEGAL: ILLEGAL4res opillegal; /// case OP_ILLEGAL: ILLEGAL4res opillegal;
/// }; /// };
/// ///
/// struct COMPOUND4args { /// struct COMPOUND4args {
/// utf8str_cs tag; /// utf8str_cs tag;
/// uint32_t minorversion; /// uint32_t minorversion;
/// nfs_argop4 argarray<>; /// nfs_argop4 argarray<>;
/// }; /// };
/// ///
/// struct COMPOUND4res { /// struct COMPOUND4res {
/// nfsstat4 status; /// nfsstat4 status;
/// utf8str_cs tag; /// utf8str_cs tag;
/// nfs_resop4 resarray<>; /// nfs_resop4 resarray<>;
/// }; /// };
/// ///
/// ///
/// /* /// /*
/// * Layout return errors, which might
/// * include the nfs_opnum4.
/// */
///
/// %/*
/// % * Encoded in the lou_body field of data type layoutupdate4:
/// % * Nothing. lou_body is a zero length array of bytes.
/// % */
/// %
///
/// %/*
/// % * Encoded in the lrf_body field of
/// % * data type layoutreturn_file4:
/// % */
/// struct layoutreturn_device_error4 {
/// deviceid4 lrde_deviceid;
/// nfsstat4 lrde_status;
/// nfs_opnum4 lrde_opnum;
/// };
///
/// struct layoutreturn_error_report4 {
/// layoutreturn_device_error4 lrer_errors<>;
/// };
///
/// %
///
///
///
/// /*
/// * Remote file service routines /// * Remote file service routines
/// */ /// */
/// program NFS4_PROGRAM { /// program NFS4_PROGRAM {
/// version NFS_V4 { /// version NFS_V4 {
/// void /// void
/// NFSPROC4_NULL(void) = 0; /// NFSPROC4_NULL(void) = 0;
/// ///
/// COMPOUND4res /// COMPOUND4res
/// NFSPROC4_COMPOUND(COMPOUND4args) = 1; /// NFSPROC4_COMPOUND(COMPOUND4args) = 1;
/// ///
 End of changes. 43 change blocks. 
114 lines changed or deleted 101 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/