[Cluster-devel] cluster/gfs-kernel/src/dlm thread.c

[teigland@sourceware.org <teigland@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-12-08 17:31:41

Modified files:
	gfs-kernel/src/dlm: thread.c 

Log message:
	If the drop_count is disabled (set to 0) on a mounted fs, don't
	do a drop callback the first time through the function (fix for
	slight quirk in the last patch for bz 218795).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/thread.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.16.2.3.6.1&r2=1.16.2.3.6.2

--- cluster/gfs-kernel/src/dlm/Attic/thread.c	2006/12/08 17:27:44	1.16.2.3.6.1
+++ cluster/gfs-kernel/src/dlm/Attic/thread.c	2006/12/08 17:31:41	1.16.2.3.6.2
@@ -295,6 +295,8 @@
 	if (check_timeout(dlm->drop_time, dlm->drop_locks_period)) {
 		dlm->drop_time = jiffies;
 		dlm->drop_locks_count = lock_dlm_drop_count;
+		if (!dlm->drop_locks_count)
+			return FALSE;
 		if (atomic_read(&dlm->lock_count) >= dlm->drop_locks_count)
 			return TRUE;
 	}