s4 torture: Convert to a more modern version of read in RAW-OPLOCK-BATCH4

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 106acfe7933b62ca02eb1ce5bfd888f7c60c03b5..85362d126f7a2d92a3c7e252b853d450ccce048f 100644 (file)
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -973,11 +973,13 @@ static bool test_raw_oplock_batch4(struct torture_context *tctx, struct smbcli_s
        fnum = io.ntcreatex.out.file.fnum;
        CHECK_VAL(io.ntcreatex.out.oplock_level, BATCH_OPLOCK_RETURN);
 
-       rd.read.level = RAW_READ_READ;
-       rd.read.in.file.fnum = fnum;
-       rd.read.in.count = 1;
-       rd.read.in.offset = 0;
-       rd.read.in.remaining = 0;
+       rd.readx.level = RAW_READ_READX;
+       rd.readx.in.file.fnum = fnum;
+       rd.readx.in.mincnt = 1;
+       rd.readx.in.maxcnt = 1;
+       rd.readx.in.offset = 0;
+       rd.readx.in.remaining = 0;
+       rd.readx.in.read_for_execute = false;
        status = smb_raw_read(cli1->tree, &rd);
        CHECK_STATUS(tctx, status, NT_STATUS_OK);
        torture_wait_for_oplock_break(tctx);