diff options
| author | Volker Lendecke <vl@samba.org> | 2013-09-04 17:26:30 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-09-06 00:47:07 +0200 |
| commit | 196da5925b6263b616149f8c4c8d67e1572dea4f (patch) | |
| tree | feeca0c2deed1becd6252d911ebee5872896aad7 /source3/include | |
| parent | 778636920b5194b101ce64956ef44c84a785145c (diff) | |
| download | samba-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 'source3/include')
| -rw-r--r-- | source3/include/smb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 9dd8c58d80..8dd6555b54 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -675,10 +675,10 @@ enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, * write. */ /* #define DEFERRED_OPEN_ENTRY 0x20 */ /* Not used anymore */ /* #define UNUSED_SHARE_MODE_ENTRY 0x40 */ /* Not used anymore */ -#define FORCE_OPLOCK_BREAK_TO_NONE 0x80 +/* #define FORCE_OPLOCK_BREAK_TO_NONE 0x80 */ /* Not used anymore */ /* None of the following should ever appear in fsp->oplock_request. */ -#define SAMBA_PRIVATE_OPLOCK_MASK (INTERNAL_OPEN_ONLY|FORCE_OPLOCK_BREAK_TO_NONE) +#define SAMBA_PRIVATE_OPLOCK_MASK (INTERNAL_OPEN_ONLY) #define EXCLUSIVE_OPLOCK_TYPE(lck) ((lck) & ((unsigned int)EXCLUSIVE_OPLOCK|(unsigned int)BATCH_OPLOCK)) #define BATCH_OPLOCK_TYPE(lck) ((lck) & (unsigned int)BATCH_OPLOCK) |