[Ocfs2-commits] mfasheh commits r1383 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-08-24 20:49:03 -0500 (Tue, 24 Aug 2004)
New Revision: 1383

Modified:
   trunk/src/dlm.c
   trunk/src/ocfs.h
Log:
* Kurt's last patch undid a change in dlm.c from my last patch. Fix
  this.

* down_with_flag and up_with_flag are no longer used



Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-08-25 01:18:55 UTC (rev 1382)
+++ trunk/src/dlm.c	2004-08-25 01:49:03 UTC (rev 1383)
@@ -504,10 +504,6 @@
 			ocfs_sleep(200);
 			ocfs_acquire_lockres(lockres, 0);
 			continue;
-		}
-		else if (status == -EINTR && ocfs_task_interruptible ()) {
-			LOG_ERROR_STR("interrupted!\n");
-			break;
 		} else 
 			LOG_ERROR_STATUS (status);
 	}

Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-08-25 01:18:55 UTC (rev 1382)
+++ trunk/src/ocfs.h	2004-08-25 01:49:03 UTC (rev 1383)
@@ -254,24 +254,6 @@
 #define  IS_VALID_EXTENT_BLOCK(ptr)  \
 	(!strcmp((ptr)->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE))
 
-
-
-#define down_with_flag(_sem, _flg)	\
-	do {				\
-		if (!_flg) {		\
-			down (_sem);	\
-			_flg = 1;	\
-		}			\
-	} while (0)
-
-#define up_with_flag(_sem, _flg)	\
-	do {				\
-		if (_flg) {		\
-			up (_sem);	\
-			_flg = 0;	\
-		}			\
-	} while (0)
-
 /*
 ** Macros
 */