diff options
| author | Volker Lendecke <vl@samba.org> | 2013-09-11 16:07:33 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-10-15 01:52:29 +0200 |
| commit | fcafaf6022832835fc8fa76a4c33056605dc53e4 (patch) | |
| tree | b9da13ff8580780efff786c9eff37b599b6fa9bb /source3/include | |
| parent | eb50c18c4a2d0caa3b8d21b2e1b536adc8dc0276 (diff) | |
| download | samba-fcafaf6022832835fc8fa76a4c33056605dc53e4.tar.gz samba-fcafaf6022832835fc8fa76a4c33056605dc53e4.tar.bz2 samba-fcafaf6022832835fc8fa76a4c33056605dc53e4.zip | |
smbd: Remove FAKE_LEVEL_II_OPLOCK
FAKE_LEVEL_II_OPLOCK was an indicator to break level2 oplock holders
on write. This information is now being held in brlock.tdb, which makes
the FAKE_LEVEL_II_OPLOCK type unnecessary.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 0d07f71750..5c0dfdcbc8 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -686,7 +686,8 @@ enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, /* The following are Samba-private. */ #define INTERNAL_OPEN_ONLY 0x8 -#define FAKE_LEVEL_II_OPLOCK 0x10 /* Client requested no_oplock, but we have to +/* #define FAKE_LEVEL_II_OPLOCK 0x10 */ /* Not used anymore */ + /* Client requested no_oplock, but we have to * inform potential level2 holders on * write. */ /* #define DEFERRED_OPEN_ENTRY 0x20 */ /* Not used anymore */ @@ -698,7 +699,7 @@ enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, #define EXCLUSIVE_OPLOCK_TYPE(lck) ((lck) & ((unsigned int)EXCLUSIVE_OPLOCK|(unsigned int)BATCH_OPLOCK)) #define BATCH_OPLOCK_TYPE(lck) ((lck) & (unsigned int)BATCH_OPLOCK) -#define LEVEL_II_OPLOCK_TYPE(lck) ((lck) & ((unsigned int)LEVEL_II_OPLOCK|(unsigned int)FAKE_LEVEL_II_OPLOCK)) +#define LEVEL_II_OPLOCK_TYPE(lck) ((lck) & (unsigned int)LEVEL_II_OPLOCK) /* kernel_oplock_message definition. |