svn commit: samba r23956 - in branches/SAMBA_3_2/source/locking: .

[metze at samba.org]

Author: metze
Date: 2007-07-18 14:03:46 +0000 (Wed, 18 Jul 2007)
New Revision: 23956

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23956

Log:
merge from 3_2-ctdb-tridge:
fixed a bug with dead share mode entries

jra: please tell me if it's ok to merge this to 3_2_0.

metze
Modified:
   branches/SAMBA_3_2/source/locking/locking.c


Changeset:
Modified: branches/SAMBA_3_2/source/locking/locking.c
===================================================================
--- branches/SAMBA_3_2/source/locking/locking.c	2007-07-18 13:52:35 UTC (rev 23955)
+++ branches/SAMBA_3_2/source/locking/locking.c	2007-07-18 14:03:46 UTC (rev 23956)
@@ -937,6 +937,14 @@
 {
 	int num_props = 0;
 
+	if (e->op_type == UNUSED_SHARE_MODE_ENTRY) {
+		/* cope with dead entries from the process not
+		   existing. These should not be considered valid,
+		   otherwise we end up doing zero timeout sharing
+		   violation */
+		return False;
+	}
+
 	num_props += ((e->op_type == NO_OPLOCK) ? 1 : 0);
 	num_props += (EXCLUSIVE_OPLOCK_TYPE(e->op_type) ? 1 : 0);
 	num_props += (LEVEL_II_OPLOCK_TYPE(e->op_type) ? 1 : 0);