sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

Making it harder for share_mode_entries to be left with

Browse Source 
non-zero op_type fields. Paranoia code really.
Jeremy (jallison@whistle.com)
This commit is contained in:
Jeremy Allison
-
parent 97ee4a5f69
commit 21ecb46f56
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/locking/locking.c
View File

@ -668,8 +668,7 @@ record due to old locking version %d for file dev %d, inode %d hash bucket %d\n"
while(entry_scanner_p)
{
if( (pid == entry_scanner_p->pid) &&
(entry_scanner_p->op_port != 0) &&
(entry_scanner_p->op_type != 0) &&
(entry_scanner_p->share_mode == Files[fnum].share_mode) &&
(memcmp(&entry_scanner_p->time,
&Files[fnum].open_time,sizeof(struct timeval)) == 0) )
{
@ -1463,9 +1462,7 @@ for share file %d\n", num_entries, fname));
if((IVAL(p,SME_SEC_OFFSET) != fs_p->open_time.tv_sec) ||
(IVAL(p,SME_USEC_OFFSET) != fs_p->open_time.tv_usec) ||
(IVAL(p,SME_SHAREMODE_OFFSET) != fs_p->share_mode) ||
(IVAL(p,SME_PID_OFFSET) != pid) ||
(SVAL(p,SME_PORT_OFFSET) == 0) ||
(SVAL(p,SME_OPLOCK_TYPE_OFFSET) == 0))
(IVAL(p,SME_PID_OFFSET) != pid))
continue;
DEBUG(5,("remove_share_oplock: clearing oplock on entry number %d (of %d) \