svn commit: samba r20893 - in branches/SAMBA_4_0/source/cluster/ctdb: .

[tridge at samba.org]

Author: tridge
Date: 2007-01-19 04:07:52 +0000 (Fri, 19 Jan 2007)
New Revision: 20893

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

Log:

brlock notifies are currently disabled in the ctdb backend. Use a #if
instead of c++ comments

Modified:
   branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c


Changeset:
Modified: branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c	2007-01-19 04:07:21 UTC (rev 20892)
+++ branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c	2007-01-19 04:07:52 UTC (rev 20893)
@@ -31,6 +31,8 @@
 #include "ntvfs/common/brlock.h"
 #include "cluster/ctdb/include/ctdb.h"
 
+#define ENABLE_NOTIFIES 0
+
 enum my_functions {FUNC_BRL_LOCK=1, FUNC_BRL_UNLOCK=2, 
 		   FUNC_BRL_REMOVE_PENDING=3, FUNC_BRL_LOCKTEST=4,
 		   FUNC_BRL_CLOSE=5};
@@ -295,7 +297,7 @@
 	struct lock_struct lock, *locks=NULL;
 	NTSTATUS status = NT_STATUS_OK;
 
-#if 0
+#if ENABLE_NOTIFIES
 	/* if this is a pending lock, then with the chainlock held we
 	   try to get the real lock. If we succeed then we don't need
 	   to make it pending. This prevents a possible race condition
@@ -436,7 +438,7 @@
 	return status;
 }
 
-#if 0
+#if ENABLE_NOTIFIES
 /*
   we are removing a lock that might be holding up a pending lock. Scan for pending
   locks that cover this range and if we find any then notify the server that it should
@@ -480,7 +482,9 @@
 	int i;
 	for (i=0;i<count;i++) {
 		if (locks->lock_type >= PENDING_READ_LOCK) {
-//			brl_ctdb_notify_unlock(brl, locks, count, &locks[i]);
+#if ENABLE_NOTIFIES
+			brl_ctdb_notify_unlock(brl, locks, count, &locks[i]);
+#endif
 		}
 	}
 }
@@ -526,7 +530,9 @@
 		    lock->start == req->start &&
 		    lock->size == req->size &&
 		    lock->lock_type < PENDING_READ_LOCK) {
-//			struct lock_struct removed_lock = *lock;
+#if ENABLE_NOTIFIES
+			struct lock_struct removed_lock = *lock;
+#endif
 
 			call->new_data = talloc(call, TDB_DATA);
 			if (call->new_data == NULL) {
@@ -544,8 +550,9 @@
 			       (count-(i+1))*sizeof(lock));
 			
 			if (count > 1) {
-				/* send notifications for any relevant pending locks */
-//				brl_ctdb_notify_unlock(req->brl, locks, count, &removed_lock);
+#if ENABLE_NOTIFIES
+				brl_ctdb_notify_unlock(req->brl, locks, count, &removed_lock);
+#endif
 			}
 			break;
 		}