diff options
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/local.h | 2 | ||||
-rw-r--r-- | source3/include/proto.h | 2 | ||||
-rw-r--r-- | source3/include/smb.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/include/local.h b/source3/include/local.h index e7eff2a300..3ce75eeb4e 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -162,6 +162,6 @@ /* Timout (in seconds) to wait for an oplock breal message to return. */ -#define OPLOCK_BREAK_TIMEOUT 120 +#define OPLOCK_BREAK_TIMEOUT 30 #endif diff --git a/source3/include/proto.h b/source3/include/proto.h index 7a1ccc626f..ac81f8cb37 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -300,12 +300,14 @@ int get_share_modes(int cnum, share_lock_token token, uint32 dev, uint32 inode, min_share_mode_entry **old_shares); void del_share_mode(share_lock_token token, int fnum); BOOL set_share_mode(share_lock_token token, int fnum, uint16 port, uint16 op_type); +BOOL remove_share_oplock(int fnum, share_lock_token token); BOOL lock_share_entry(int cnum, uint32 dev, uint32 inode, share_lock_token *ptok); BOOL unlock_share_entry(int cnum, uint32 dev, uint32 inode, share_lock_token token); int get_share_modes(int cnum, share_lock_token token, uint32 dev, uint32 inode, min_share_mode_entry **old_shares); void del_share_mode(share_lock_token token, int fnum); BOOL set_share_mode(share_lock_token token,int fnum, uint16 port, uint16 op_type); +BOOL remove_share_oplock(int fnum, share_lock_token token); /*The following definitions come from mangle.c */ diff --git a/source3/include/smb.h b/source3/include/smb.h index c8de001fda..509c1e1cf1 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -515,9 +515,9 @@ struct connect_record #define SMF_HEADER_LENGTH 10 #ifdef USE_OPLOCKS -#define SMF_ENTRY_LENGTH 16 -#else /* USE_OPLOCKS */ #define SMF_ENTRY_LENGTH 20 +#else /* USE_OPLOCKS */ +#define SMF_ENTRY_LENGTH 16 #endif /* USE_OPLOCKS */ /* |