summaryrefslogtreecommitdiff
path: root/source4/torture/raw
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-09-04 17:26:30 +0200
committerJeremy Allison <jra@samba.org>2013-09-06 00:47:07 +0200
commit196da5925b6263b616149f8c4c8d67e1572dea4f (patch)
treefeeca0c2deed1becd6252d911ebee5872896aad7 /source4/torture/raw
parent778636920b5194b101ce64956ef44c84a785145c (diff)
downloadsamba-196da5925b6263b616149f8c4c8d67e1572dea4f.tar.gz
samba-196da5925b6263b616149f8c4c8d67e1572dea4f.tar.bz2
samba-196da5925b6263b616149f8c4c8d67e1572dea4f.zip
smbd: Remove FORCE_OPLOCK_BREAK_TO_NONE
This flag existed to break an exclusive or batch oplock in just one instead of two steps down to "no oplock" when we did an allocation or file size change. Running raw.oplock against W2k12 differs in this respect from W2k3: W2k12 takes two steps (via level2) to break to none. This removes the special flag that we only had for compatibility with systems older than W2k12... Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Fri Sep 6 00:47:07 CEST 2013 on sn-devel-104
Diffstat (limited to 'source4/torture/raw')
-rw-r--r--source4/torture/raw/oplock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index ad21623fc9..c2e086aa95 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -264,6 +264,9 @@ static uint8_t get_setinfo_break_count(struct torture_context *tctx)
if (TARGET_IS_W2K12(tctx)) {
return 2;
}
+ if (TARGET_IS_SAMBA3(tctx)) {
+ return 2;
+ }
return 1;
}