From 4438d7b57e459e091017fcbe18547a8b69be4d80 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 3 Oct 1997 03:15:24 +0000 Subject: proto.h: Updated. server.c: Updated after netbench observation. Oplocks must be broken *before* share modes are checked, not after. Netbench seems to be working now. smb.h: Added offsets for oplock break time fields. trans2.c: Upped debug messages. util.c: Upped debug messages. Jeremy (jallison@whistle.com) (This used to be commit bc4b70c566ed5fa926441fb64a0f756a6137d8d0) --- source3/include/proto.h | 2 +- source3/include/smb.h | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 51433333c5..35d43afe0c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -722,7 +722,7 @@ int find_service(char *service); int cached_error_packet(char *inbuf,char *outbuf,int fnum,int line); int unix_error_packet(char *inbuf,char *outbuf,int def_class,uint32 def_code,int line); int error_packet(char *inbuf,char *outbuf,int error_class,uint32 error_code,int line); -BOOL oplock_break(uint32 dev, uint32 inode); +BOOL oplock_break(uint32 dev, uint32 inode, struct timeval *tval); BOOL request_oplock_break(min_share_mode_entry *share_entry, uint32 dev, uint32 inode); BOOL snum_used(int snum); diff --git a/source3/include/smb.h b/source3/include/smb.h index 509c1e1cf1..66da2099c7 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1049,17 +1049,19 @@ extern int unix_ERR_code; * * Form of this is : * - * 0 2 6 10 - * +----+--------+--------+--------+ - * | cmd| pid | dev | inode | - * +----+--------+--------+--------+ + * 0 2 6 10 14 18 22 + * +----+--------+--------+--------+-------+--------+ + * | cmd| pid | dev | inode | sec | usec | + * +----+--------+--------+--------+-------+--------+ */ #define OPLOCK_BREAK_CMD 0x1 #define OPLOCK_BREAK_PID_OFFSET 2 #define OPLOCK_BREAK_DEV_OFFSET 6 #define OPLOCK_BREAK_INODE_OFFSET 10 -#define OPLOCK_BREAK_MSG_LEN 14 +#define OPLOCK_BREAK_SEC_OFFSET 14 +#define OPLOCK_BREAK_USEC_OFFSET 18 +#define OPLOCK_BREAK_MSG_LEN 22 #define CMD_REPLY 0x8000 -- cgit