diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-05-19 15:10:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:09 -0500 |
| commit | 7f0e17e9030ad734977f66c2cc27faec501154a2 (patch) | |
| tree | dc44952b04d4e61fb8fcff50b4a3cb720276b57d /source4/torture | |
| parent | 472c0886254b82c2feffea734a80c4d29bd773b6 (diff) | |
| download | samba-7f0e17e9030ad734977f66c2cc27faec501154a2.tar.gz samba-7f0e17e9030ad734977f66c2cc27faec501154a2.tar.bz2 samba-7f0e17e9030ad734977f66c2cc27faec501154a2.zip | |
r15718: - split the SMBflush with the 0xFFFF wildcard fnum into a different level
metze
(This used to be commit 95bf41b4d4ec96349802955e364fe44ef85f9077)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/basic/delaywrite.c | 1 | ||||
| -rw-r--r-- | source4/torture/nbench/nbio.c | 3 | ||||
| -rw-r--r-- | source4/torture/raw/close.c | 11 |
3 files changed, 10 insertions, 5 deletions
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 7708e1c76d..4063eda6f2 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -253,6 +253,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem printf("Doing flush after write\n"); + flsh.flush.level = RAW_FLUSH_FLUSH; flsh.flush.in.file.fnum = fnum1; status = smb_raw_flush(cli->tree, &flsh); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index e87a138a8e..2e8be5057a 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -646,7 +646,8 @@ void nb_flush(int fnum, NTSTATUS status) int i; i = find_handle(fnum); - io.flush.in.file.fnum = i; + io.flush.level = RAW_FLUSH_FLUSH; + io.flush.in.file.fnum = i; ret = smb_raw_flush(c->tree, &io); diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c index 41c6956c25..1a3b5f28be 100644 --- a/source4/torture/raw/close.c +++ b/source4/torture/raw/close.c @@ -144,24 +144,27 @@ BOOL torture_raw_close(struct torture_context *torture) printf("testing flush\n"); smbcli_close(cli->tree, fnum); - io_flush.flush.in.file.fnum = fnum; + io_flush.flush.level = RAW_FLUSH_FLUSH; + io_flush.flush.in.file.fnum = fnum; status = smb_raw_flush(cli->tree, &io_flush); CHECK_STATUS(status, NT_STATUS_INVALID_HANDLE); - io_flush.flush.in.file.fnum = 0xffff; + io_flush.flush_all.level = RAW_FLUSH_ALL; status = smb_raw_flush(cli->tree, &io_flush); CHECK_STATUS(status, NT_STATUS_OK); REOPEN; - io_flush.flush.in.file.fnum = fnum; + io_flush.flush.level = RAW_FLUSH_FLUSH; + io_flush.flush.in.file.fnum = fnum; status = smb_raw_flush(cli->tree, &io_flush); CHECK_STATUS(status, NT_STATUS_OK); printf("Testing SMBexit\n"); smb_raw_exit(cli->session); - io_flush.flush.in.file.fnum = fnum; + io_flush.flush.level = RAW_FLUSH_FLUSH; + io_flush.flush.in.file.fnum = fnum; status = smb_raw_flush(cli->tree, &io_flush); CHECK_STATUS(status, NT_STATUS_INVALID_HANDLE); |