git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
522d6bc
)
s4 torture: Close the third handle in RAW-OPLOCK-BATCH22
author
Tim Prouty
<tprouty@samba.org>
Thu, 3 Dec 2009 21:16:18 +0000
(13:16 -0800)
committer
Tim Prouty
<tprouty@samba.org>
Fri, 4 Dec 2009 02:54:52 +0000
(18:54 -0800)
source4/torture/raw/oplock.c
patch
|
blob
|
history
diff --git
a/source4/torture/raw/oplock.c
b/source4/torture/raw/oplock.c
index 2531989b8c5cdceef42e7c0fbc2a9010290bae79..d35445c7eb94c95021f3c8bea8d7fa9de89177bd 100644
(file)
--- a/
source4/torture/raw/oplock.c
+++ b/
source4/torture/raw/oplock.c
@@
-2627,7
+2627,7
@@
static bool test_raw_oplock_batch22(struct torture_context *tctx, struct smbcli_
NTSTATUS status;
bool ret = true;
union smb_open io;
NTSTATUS status;
bool ret = true;
union smb_open io;
- uint16_t fnum
=0, fnum2=
0;
+ uint16_t fnum
= 0, fnum2 = 0, fnum3 =
0;
struct timeval tv;
int timeout = torture_setting_int(tctx, "oplocktimeout", 30);
int te;
struct timeval tv;
int timeout = torture_setting_int(tctx, "oplocktimeout", 30);
int te;
@@
-2684,6
+2684,8
@@
static bool test_raw_oplock_batch22(struct torture_context *tctx, struct smbcli_
CHECK_STATUS(tctx, status, NT_STATUS_OK);
}
CHECK_STATUS(tctx, status, NT_STATUS_OK);
}
+ fnum2 = io.ntcreatex.out.file.fnum;
+
torture_wait_for_oplock_break(tctx);
te = (int)timeval_elapsed(&tv);
torture_wait_for_oplock_break(tctx);
te = (int)timeval_elapsed(&tv);
@@
-2718,12
+2720,13
@@
static bool test_raw_oplock_batch22(struct torture_context *tctx, struct smbcli_
te = (int)timeval_elapsed(&tv);
/* it should come in without delay */
CHECK_RANGE(te+1, 0, timeout);
te = (int)timeval_elapsed(&tv);
/* it should come in without delay */
CHECK_RANGE(te+1, 0, timeout);
- fnum
2
= io.ntcreatex.out.file.fnum;
+ fnum
3
= io.ntcreatex.out.file.fnum;
CHECK_VAL(break_info.count, 0);
smbcli_close(cli1->tree, fnum);
smbcli_close(cli1->tree, fnum2);
CHECK_VAL(break_info.count, 0);
smbcli_close(cli1->tree, fnum);
smbcli_close(cli1->tree, fnum2);
+ smbcli_close(cli1->tree, fnum3);
done:
smb_raw_exit(cli1->session);
done:
smb_raw_exit(cli1->session);