[Ocfs2-tools-commits] jlbec commits r647 - branches/usysfsify/mount.ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-03-16 18:01:50 -0600 (Wed, 16 Mar 2005)
New Revision: 647

Modified:
   branches/usysfsify/mount.ocfs2/mount.ocfs2.c
   branches/usysfsify/mount.ocfs2/mount.ocfs2.h
Log:

o Rip out the old group stuff from mount.ocfs2.  Do it brutally, and
  force the program to fail.



Modified: branches/usysfsify/mount.ocfs2/mount.ocfs2.c
===================================================================
--- branches/usysfsify/mount.ocfs2/mount.ocfs2.c	2005-03-16 23:57:02 UTC (rev 646)
+++ branches/usysfsify/mount.ocfs2/mount.ocfs2.c	2005-03-17 00:01:50 UTC (rev 647)
@@ -186,6 +186,7 @@
 
 static int get_my_nodenum(uint8_t *nodenum)
 {
+#if 0
 	FILE *file;
 	int ret = -EINVAL;
 	int retval=-EINVAL, num;
@@ -212,10 +213,14 @@
 done:	
 	fclose(file);
 	return ret;
+#else
+        return 0;
+#endif
 }
 
 static int create_group(char *uuid, uint8_t *group_num)
 {
+#if 0
 	FILE *file;
 	int ret = -EINVAL, retval;
 	int groupnum = NM_INVALID_SLOT_NUM;
@@ -261,11 +266,15 @@
 done:	
 	fclose(file);
 	return ret;
+#else
+        return 0;
+#endif
 }
 
 
 static int add_to_local_group(char *uuid, uint8_t group_num, uint8_t node_num)
 {
+#if 0
 	FILE *file;
 	int ret = -EINVAL, retval;
 	nm_op *op = (nm_op *)op_buf;
@@ -311,11 +320,15 @@
 done:	
 	fclose(file);
 	return ret;
+#else
+        return 0;
+#endif
 }
 
 static int activate_group(char *group_name, char *group_dev, uint8_t group_num, 
 		   uint32_t block_bits, uint64_t num_blocks, uint64_t start_block)
 {
+#if 0
 	int dev_fd = -1;
 	int ret = -EINVAL, retval;
 	FILE *file;
@@ -357,6 +370,7 @@
 		close(dev_fd);
 
 	fclose(file);
+#endif
 	return 0;
 }
 
@@ -412,6 +426,7 @@
 
 static int get_node_map(uint8_t group_num, char *bitmap)
 {
+#if 0
 	FILE *file = NULL;
 	hb_op *op;
 	int ret = -EINVAL;
@@ -457,12 +472,16 @@
 done:
 	fclose(file);
 	return ret;
+#else
+        return 0;
+#endif
 }
 
 static int get_raw_node_map(uint8_t groupnum, char *groupdev,
 			    uint32_t block_bits, uint32_t num_blocks,
 			    uint64_t start_block, char *bitmap)
 {
+#if 0
 	int i;
 	int ret = -EINVAL;
 	char *buf = NULL, *tmpbuf;
@@ -544,10 +563,14 @@
 	if (times)
 		free(times);
 	return ret;
+#else
+        return 0;
+#endif
 }
 
 static int create_remote_group(char *group_name, uint8_t node)
 {
+#if 0
 	int ret, fd = -1, remote_node = -1;
 	gsd_ioc ioc;
 	char fname[100];
@@ -637,6 +660,9 @@
 	if (remote_node != -1)
 		close(remote_node);
 	return ret;
+#else
+        return 0;
+#endif
 }
 
 /*
@@ -646,6 +672,7 @@
  */
 static int add_me_to_group(char *groupname, char *groupdev)
 {
+#if 0
 	int ret;
 	uint8_t my_nodenum, groupnum;
 	uint32_t pre_nodemap[] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -767,6 +794,7 @@
 	if (verbose)
 		printf("ah nothing left to care about ... leaving\n");
 
+#endif
 	return 0;
 }
 
@@ -797,6 +825,9 @@
 	initialize_ocfs_error_table();
 	initialize_o2dl_error_table();
 
+        fprintf(stderr, "mount.ocfs2 no workie!\n");
+        return EIO;
+
 	read_options (argc, argv, &mo);
 
 	ret = process_options(&mo);

Modified: branches/usysfsify/mount.ocfs2/mount.ocfs2.h
===================================================================
--- branches/usysfsify/mount.ocfs2/mount.ocfs2.h	2005-03-16 23:57:02 UTC (rev 646)
+++ branches/usysfsify/mount.ocfs2/mount.ocfs2.h	2005-03-17 00:01:50 UTC (rev 647)
@@ -55,11 +55,3 @@
 
 #include "bitops.h"
 
-#include "ocfs2_nodemanager.h"
-#include "ocfs2_heartbeat.h"
-#include "ocfs2_tcp.h"
-
-#define CLUSTER_FILE   "/proc/cluster/nm/.cluster"
-#define GROUP_FILE     "/proc/cluster/nm/.group"
-#define NODE_FILE      "/proc/cluster/nm/.node"
-#define HEARTBEAT_DISK_FILE "/proc/cluster/heartbeat/.disk"