[PATCH 1/1] DIO: add NFSv4.2 READ_PLUS support for nfstest_dio

[Dai Ngo <dai.ngo@oracle.com>]

From: Oracle Public Cloud User <opc@dngo-nfstest-client.allregionaliads.osdevelopmeniad.oraclevcn.com>

Check for nfs_version >= 4.2 and use READ_PLUS instead of READ.

Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
---
 test/nfstest_dio | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/nfstest_dio b/test/nfstest_dio
index 093e552..653a842 100755
--- a/test/nfstest_dio
+++ b/test/nfstest_dio
@@ -617,6 +617,8 @@ class DioTest(TestUtil):
 
             if nfs_version < 4:
                 match_str = "NFS.argop == %d and NFS.fh == b'%s'" % (NFSPROC3_READ, self.pktt.escape(filehandle))
+            elif nfs_version >= 4.2:
+                match_str = "NFS.argop == %d and NFS.stateid.other == b'%s'" % (OP_READ_PLUS, self.pktt.escape(stateid))
             else:
                 match_str = "NFS.argop == %d and NFS.stateid.other == b'%s'" % (OP_READ, self.pktt.escape(stateid))
 
@@ -744,9 +746,13 @@ class DioTest(TestUtil):
             fd = None
             bfd = None
             ofd = None
-            io_str  = "WRITE" if write else "READ"
+            if self.nfs_version >= 4.2:
+                io_str  = "WRITE" if write else "READ_PLUS"
+                bio_str  = "WRITE" if buffered_write else "READ_PLUS"
+            else:
+                io_str  = "WRITE" if write else "READ"
+                bio_str  = "WRITE" if buffered_write else "READ"
             io_mode = posix.O_WRONLY|posix.O_CREAT if write else posix.O_RDONLY
-            bio_str  = "WRITE" if buffered_write else "READ"
             bio_mode = os.O_WRONLY|os.O_CREAT if buffered_write else os.O_RDONLY
 
             if not bsize:
@@ -861,6 +867,8 @@ class DioTest(TestUtil):
 
             if nfs_version < 4:
                 io_op  = NFSPROC3_WRITE if write else NFSPROC3_READ
+            elif nfs_version >= 4.2:
+                io_op  = OP_WRITE if write else OP_READ_PLUS
             else:
                 io_op  = OP_WRITE if write else OP_READ
 
@@ -985,6 +993,8 @@ class DioTest(TestUtil):
 
                 if nfs_version < 4:
                     bio_op = NFSPROC3_WRITE if buffered_write else NFSPROC3_READ
+                elif nfs_version >= 4.2:
+                    bio_op = OP_WRITE if buffered_write else OP_READ_PLUS
                 else:
                     bio_op = OP_WRITE if buffered_write else OP_READ
 
@@ -1270,6 +1280,8 @@ class DioTest(TestUtil):
 
             if nfs_version < 4:
                 io_op = NFSPROC3_WRITE if write else NFSPROC3_READ
+            elif nfs_version >= 4.2:
+                io_op  = OP_WRITE if write else OP_READ_PLUS
             else:
                 io_op = OP_WRITE if write else OP_READ
 
-- 
2.47.3