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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-11-23 16:55:09 -0600 (Tue, 23 Nov 2004)
New Revision: 1672

Modified:
   branches/dlm-glue/src/ocfs.h
   branches/dlm-glue/src/util.c
   branches/dlm-glue/src/util.h
Log:
* ok, the timeout stuff is no longer being used either.



Modified: branches/dlm-glue/src/ocfs.h
===================================================================
--- branches/dlm-glue/src/ocfs.h	2004-11-23 22:47:56 UTC (rev 1671)
+++ branches/dlm-glue/src/ocfs.h	2004-11-23 22:55:09 UTC (rev 1672)
@@ -444,13 +444,6 @@
 	char nodename[255];	/* node name */
 };
 
-/* timeout structure taken from Ben's aio.c */
-typedef struct _ocfs_timeout {
-	struct timer_list	timer;
-	int			timed_out;
-	wait_queue_head_t	wait;
-} ocfs_timeout;
-
 #define NAMEI_RA_CHUNKS  2
 #define NAMEI_RA_BLOCKS  4
 #define NAMEI_RA_SIZE        (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)

Modified: branches/dlm-glue/src/util.c
===================================================================
--- branches/dlm-glue/src/util.c	2004-11-23 22:47:56 UTC (rev 1671)
+++ branches/dlm-glue/src/util.c	2004-11-23 22:55:09 UTC (rev 1672)
@@ -38,8 +38,6 @@
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT  OCFS_DEBUG_CONTEXT_UTIL
 
-static void ocfs_timeout_func(unsigned long data);
-
 /* block all but 'mask' sigs, optionally saving off our previous
  * signal state. */
 void ocfs_block_sigs(sigset_t *oldsigs, unsigned long mask)
@@ -138,46 +136,6 @@
 #endif
 #endif
 
-
-static void ocfs_timeout_func(unsigned long data)
-{
-	ocfs_timeout *to = (ocfs_timeout *)data; 
-
-	to->timed_out = 1;
-	wake_up(&to->wait);
-}
-
-void ocfs_init_timeout(ocfs_timeout *to)
-{
-	init_timer(&to->timer);
-	to->timer.data = (unsigned long)to;
-	to->timer.function = ocfs_timeout_func;
-	to->timed_out = 0;
-	init_waitqueue_head(&to->wait);
-}
-
-void ocfs_set_timeout(ocfs_timeout *to, __u32 timeout)
-{
-	__u32 how_long;
-
-	if (!timeout) {
-		to->timed_out = 1;
-		return ;
-	}
-
-	how_long = (timeout * HZ / 1000);
-	if (how_long < 1)
-		how_long = 1;
-
-	to->timer.expires = jiffies + how_long;
-	add_timer(&to->timer);
-}
-
-void ocfs_clear_timeout(ocfs_timeout *to)
-{
-	del_timer_sync(&to->timer);
-}
-
 void ocfs_truncate_inode_pages(struct inode *inode, loff_t off)
 {
 	LOG_TRACE_ARGS("truncating pages for inode %llu (%p) from offset %llu\n", 

Modified: branches/dlm-glue/src/util.h
===================================================================
--- branches/dlm-glue/src/util.h	2004-11-23 22:47:56 UTC (rev 1671)
+++ branches/dlm-glue/src/util.h	2004-11-23 22:55:09 UTC (rev 1672)
@@ -26,10 +26,7 @@
 #ifndef OCFS2_UTIL_H
 #define OCFS2_UTIL_H
 
-void ocfs_clear_timeout(ocfs_timeout *to);
 void ocfs_daemonize(char *name, int len, int shutdown_sigs);
-void ocfs_init_timeout(ocfs_timeout *to);
-void ocfs_set_timeout(ocfs_timeout *to, __u32 timeout);
 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);