From fcafaf6022832835fc8fa76a4c33056605dc53e4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 11 Sep 2013 16:07:33 +0000 Subject: 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 Reviewed-by: Jeremy Allison --- source3/include/smb.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/include') 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. -- cgit