[Ocfs2-commits] mfasheh commits r1664 - branches/dlm-glue/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-11-22 21:40:18 -0600 (Mon, 22 Nov 2004)
New Revision: 1664

Modified:
   branches/dlm-glue/src/ocfs.h
   branches/dlm-glue/src/util.c
   branches/dlm-glue/src/util.h
Log:
* kill more unused code.



Modified: branches/dlm-glue/src/ocfs.h
===================================================================
--- branches/dlm-glue/src/ocfs.h	2004-11-23 03:37:18 UTC (rev 1663)
+++ branches/dlm-glue/src/ocfs.h	2004-11-23 03:40:18 UTC (rev 1664)
@@ -492,44 +492,6 @@
 								\
 } while(0)
 
-#define __ocfs_wait_uninterruptible(wq, condition, timeo, ret)	\
-do {								\
-	ocfs_timeout __to;					\
-								\
-	DECLARE_WAITQUEUE(__wait, current);			\
-	DECLARE_WAITQUEUE(__to_wait, current);			\
-								\
-	ocfs_init_timeout(&__to);				\
-								\
-	if (timeo) {						\
-		ocfs_set_timeout(&__to, timeo);			\
-		if (__to.timed_out) {				\
-			ocfs_clear_timeout(&__to);		\
-		}						\
-	}							\
-								\
-	add_wait_queue(&wq, &__wait);				\
-	add_wait_queue(&__to.wait, &__to_wait);			\
-	do {							\
-		ret = 0;					\
-		set_current_state(TASK_UNINTERRUPTIBLE);	\
-		if (condition)					\
-			break;					\
-		ret = -ETIMEDOUT;				\
-		if (__to.timed_out)				\
-			break;					\
-		schedule();					\
-	} while (1);						\
-								\
-	set_current_state(TASK_RUNNING);			\
-	remove_wait_queue(&wq, &__wait);			\
-	remove_wait_queue(&__to.wait, &__to_wait);		\
-								\
-	if (timeo)						\
-		ocfs_clear_timeout(&__to);			\
-								\
-} while(0)
-
 #define ocfs_wait(wq, condition, timeout)			\
 ({								\
 	int __ret = 0;						\
@@ -538,14 +500,6 @@
 	__ret;							\
 })
 
-#define ocfs_wait_uninterruptible(wq, condition, timeout)		      \
-({									      \
-	int __ret = 0;							      \
-	if (!(condition))						      \
-		__ocfs_wait_uninterruptible(wq, condition, timeout, __ret);   \
-	__ret;								      \
-})
-
 static inline unsigned long ino_from_blkno(struct super_block *sb,
 					   u64 blkno)
 {

Modified: branches/dlm-glue/src/util.c
===================================================================
--- branches/dlm-glue/src/util.c	2004-11-23 03:37:18 UTC (rev 1663)
+++ branches/dlm-glue/src/util.c	2004-11-23 03:40:18 UTC (rev 1664)
@@ -250,46 +250,5 @@
 
 }
 
-int __ocfs_wait_atomic_eq(wait_queue_head_t *wq, atomic_t *var, int val, int ms)
-{
-	int ret;
-	ocfs_timeout timeout;
-	DECLARE_WAITQUEUE(wait, current);
-	DECLARE_WAITQUEUE(to_wait, current);
 
-	ocfs_init_timeout(&timeout);
 
-	if (ms) {
-		ocfs_set_timeout(&timeout, ms);
-		if (timeout.timed_out) {
-			ocfs_clear_timeout(&timeout);
-		}
-	}
-	add_wait_queue(wq, &wait);
-	add_wait_queue(&timeout.wait, &to_wait);
-	do { 
-		ret = 0;
-		set_current_state(TASK_INTERRUPTIBLE);
-		if (atomic_read(var)==val)
-			break;
-		ret = -ETIMEDOUT;
-		if (timeout.timed_out)
-			break;
-		schedule();
-		if (signal_pending(current)) {
-			ret = -EINTR;
-			break;
-		}
-	} while (1);
-	
-	set_current_state(TASK_RUNNING);
-	remove_wait_queue(wq, &wait);
-	remove_wait_queue(&timeout.wait, &to_wait);
-
-	if (ms)
-		ocfs_clear_timeout(&timeout);
-
-	return ret;
-}
-
-

Modified: branches/dlm-glue/src/util.h
===================================================================
--- branches/dlm-glue/src/util.h	2004-11-23 03:37:18 UTC (rev 1663)
+++ branches/dlm-glue/src/util.h	2004-11-23 03:40:18 UTC (rev 1664)
@@ -33,18 +33,7 @@
 void ocfs_show_stack(unsigned long *esp);
 void ocfs_show_trace(unsigned long *stack);
 void ocfs_truncate_inode_pages(struct inode *inode, loff_t off);
-int __ocfs_wait_atomic_eq(wait_queue_head_t *wq, atomic_t *var, int val, int ms);
 void ocfs_block_sigs(sigset_t *oldsigs, unsigned long mask);
 void ocfs_unblock_sigs(sigset_t newsig);
 
-/* exits when var == val, or on timeout */
-static inline int ocfs_wait_atomic_eq(wait_queue_head_t *wq, atomic_t *var, int val, int timeout)
-{
-	int ret = 0;
-	if (atomic_read(var) != val)
-		ret = __ocfs_wait_atomic_eq(wq, var, val, timeout);
-	return ret;
-}
-
-
 #endif /* OCFS2_UTIL_H */