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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-09 15:43:26 -0500 (Thu, 09 Sep 2004)
New Revision: 1444

Modified:
   trunk/src/alloc.c
   trunk/src/heartbeat.c
   trunk/src/util.c
Log:
* remove the USERSPACE_TOOL junk as that's not used and should never,
  ever be used anyway.



Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c	2004-09-09 20:42:51 UTC (rev 1443)
+++ trunk/src/alloc.c	2004-09-09 20:43:26 UTC (rev 1444)
@@ -48,9 +48,6 @@
 #include "ocfs_journal.h"
 #include "buffer_head_io.h"
 
-#ifndef USERSPACE_TOOL
-
-
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT    OCFS_DEBUG_CONTEXT_ALLOC
 
@@ -1526,11 +1523,6 @@
 	return (status);
 }				/* ocfs_allocate_extent */
 
-#endif				/* !USERSPACE_TOOL */
-
-
-#ifndef USERSPACE_TOOL
-
 /*
  * _squish_extent_entries()
  * FileSize is the allocated size of the file after the truncate.
@@ -1609,8 +1601,6 @@
 	return status; 
 }				/* _squish_extent_entries */
 
-#endif				/* !USERSPACE_TOOL */
-
 /* used by ocfs_kill_this_tree and ocfs_split_this_tree */
 /* This value needs to be removed in a future version and set to
  * tree_depth + 1, dynamically */
@@ -1754,7 +1744,6 @@
 	return(status);
 } /* ocfs_kill_this_tree */
 
-#ifndef USERSPACE_TOOL
 
 static int ocfs_fix_extent_block(ocfs_super *osb,
 				 struct buffer_head *eb_bh,
@@ -2540,7 +2529,6 @@
 	return status;
 }  /* ocfs_free_extents_for_truncate */
 
-#endif				/* !USERSPACE_TOOL */
 
 /*
  * ocfs_lookup_file_allocation()

Modified: trunk/src/heartbeat.c
===================================================================
--- trunk/src/heartbeat.c	2004-09-09 20:42:51 UTC (rev 1443)
+++ trunk/src/heartbeat.c	2004-09-09 20:43:26 UTC (rev 1444)
@@ -47,7 +47,6 @@
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT      OCFS_DEBUG_CONTEXT_HEARTBEAT
 
-#if !defined(USERSPACE_TOOL)
 /*
  * ocfs_nm_heart_beat()
  *
@@ -113,7 +112,6 @@
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_nm_heart_beat */
-#endif				/* !defined(USERPSPACE_TOOL) */
 
 
 /*
@@ -144,13 +142,12 @@
 
 	/* First time thru, update buffer with timestamps for all nodes */
 	if (first_time) {
-#if !defined(USERSPACE_TOOL)
 		/* Read the last comm_seq_num */
 		publish = (ocfs_publish *) bhs[osb->node_num]->b_data;
 		spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
 		OcfsGlobalCtxt.comm_seq_num = publish->comm_seq_num + 10;
 		spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
-#endif
+
 		/* Refresh local buffers */
 		for (i = 0;  i < num_nodes; i++) {
 			publish = (ocfs_publish *) bhs[i]->b_data;
@@ -213,13 +210,11 @@
 				}
 			}
 		} else {
-#if !defined(USERSPACE_TOOL)
 			if (!ocfs_node_is_alive(&osb->publ_map, i) &&
 			    (osb->node_num != i))
 				printk ("ocfs2: Adding %s (node %d) to clustered device (%u,%u)\n",
 					osb->node_cfg_info[i]->node_name, i,
 					MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev));
-#endif
 			node_map[i].miss_cnt = 0;
 			node_map[i].time = publish->time;
 			ocfs_publish_map_set(&osb->publ_map, i);

Modified: trunk/src/util.c
===================================================================
--- trunk/src/util.c	2004-09-09 20:42:51 UTC (rev 1443)
+++ trunk/src/util.c	2004-09-09 20:43:26 UTC (rev 1444)
@@ -41,9 +41,6 @@
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT  OCFS_DEBUG_CONTEXT_UTIL
 
-
-#ifndef USERSPACE_TOOL
-
 static void ocfs_timeout_func(unsigned long data);
 
 /* block all but 'mask' sigs, optionally saving off our previous
@@ -209,8 +206,6 @@
 	del_timer_sync(&to->timer);
 }
 
-#endif				/* !USERSPACE_TOOL */
-
 void ocfs_truncate_inode_pages(struct inode *inode, loff_t off)
 {
 	LOG_TRACE_ARGS("truncating pages for inode %llu (%p) from offset %llu\n",