[Ocfs2-tools-commits] jlbec commits r1370 - branches/cman-based/ocfs2_controld

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-07-17 19:06:56 -0700 (Tue, 17 Jul 2007)
New Revision: 1370

Modified:
   branches/cman-based/ocfs2_controld/main.c
   branches/cman-based/ocfs2_controld/ocfs2_controld.h
Log:

Remove more recovery and plock stuff that we don't care about.



Modified: branches/cman-based/ocfs2_controld/main.c
===================================================================
--- branches/cman-based/ocfs2_controld/main.c	2007-07-18 00:37:47 UTC (rev 1369)
+++ branches/cman-based/ocfs2_controld/main.c	2007-07-18 02:06:56 UTC (rev 1370)
@@ -48,7 +48,6 @@
 extern struct list_head mounts;
 extern struct list_head withdrawn_mounts;
 int no_withdraw;
-int dmsetup_wait;
 
 int do_read(int fd, void *buf, size_t count)
 {
@@ -364,7 +363,7 @@
 	return s;
 }
 
-int loop(void)
+static int loop(void)
 {
 	int rv, i, f, poll_timeout = -1;
 
@@ -423,17 +422,6 @@
 				}
 				client_dead(i);
 			}
-
-			if (dmsetup_wait) {
-				update_dmsetup_wait();
-				if (dmsetup_wait) {
-					if (poll_timeout == -1)
-						poll_timeout = 1000;
-				} else {
-					if (poll_timeout == 1000)
-						poll_timeout = -1;
-				}
-			}
 		}
 	}
 	rv = 0;

Modified: branches/cman-based/ocfs2_controld/ocfs2_controld.h
===================================================================
--- branches/cman-based/ocfs2_controld/ocfs2_controld.h	2007-07-18 00:37:47 UTC (rev 1369)
+++ branches/cman-based/ocfs2_controld/ocfs2_controld.h	2007-07-18 02:06:56 UTC (rev 1370)
@@ -163,28 +163,10 @@
 	int			kernel_mount_error;
 	int			kernel_mount_done;
 	int			got_kernel_mount;
-	int			first_mount_pending_stop;
-	int			first_mounter;
-	int			first_mounter_done;
-	int			global_first_recover_done;
-	int			emulate_first_mounter;
-	int			wait_first_done;
-	int			low_nodeid;
-	int			master_nodeid;
-	int			save_plocks;
 
-	uint64_t		cp_handle;
-	time_t			last_checkpoint_time;
-	time_t			last_plock_time;
-
-	int			needs_recovery;
-	int			our_jid;
 	int			spectator;
 	int			readonly;
 	int			rw;
-	int			withdraw;
-	int			dmsetup_wait;
-	pid_t			dmsetup_pid;
 
 	struct list_head	saved_messages;
 	void			*start2_fn;
@@ -218,25 +200,17 @@
 struct mg_member {
 	struct list_head	list;
 	int			nodeid;
-	int			jid;
 
 	int			spectator;
 	int			readonly;
 	int			rw;
 	uint32_t		opts;
 
-	int			tell_gfs_to_recover;
-	int			wait_gfs_recover_done;
 	int			gone_event;
 	int			gone_type;
 	int			finished;
-	int			local_recovery_status;
-	int			recovery_status;
-	int			withdrawing;
-	int			needs_journals;
 
 	int			ms_kernel_mount_done;
-	int			ms_first_mounter;
 	int			ms_kernel_mount_error;
 };
 
@@ -251,26 +225,7 @@
 	MSG_RECOVERY_DONE,
 };
 
-#define GDLM_VER_MAJOR 1
-#define GDLM_VER_MINOR 0
-#define GDLM_VER_PATCH 0
 
-struct gdlm_header {
-	uint16_t		version[3];
-	uint16_t		type;			/* MSG_ */
-	uint32_t		nodeid;			/* sender */
-	uint32_t		to_nodeid;		/* 0 if to all */
-	char			name[MAXNAME];
-};
-
-struct save_msg {
-	struct list_head list;
-	int nodeid;
-	int len;
-	int type;
-	char buf[0];
-};
-
 int do_read(int fd, void *buf, size_t count);
 int do_write(int fd, void *buf, size_t count);
 struct mountgroup *find_mg(char *name);
@@ -278,35 +233,19 @@
 
 int setup_cman(void);
 int process_cman(void);
-int setup_cpg(void);
-int process_cpg(void);
 int setup_groupd(void);
 int process_groupd(void);
-int setup_plocks(void);
-int process_plocks(void);
 void exit_cman(void);
 
 int do_mount(int ci, char *dir, char *type, char *proto, char *table,
 	     char *options, char *dev, struct mountgroup **mg_ret);
 int do_unmount(int ci, char *dir, int mnterr);
 int do_remount(int ci, char *dir, char *mode);
-int do_withdraw(char *name);
-int kernel_recovery_done(char *name);
 void ping_kernel_mount(char *table);
-void save_message(struct mountgroup *mg, char *buf, int len, int from, int type);
 void got_mount_result(struct mountgroup *mg, int result, int ci, int another);
 
 int client_send(int ci, char *buf, int len);
 
-int send_group_message(struct mountgroup *mg, int len, char *buf);
 void update_flow_control_status(void);
 
-void store_plocks(struct mountgroup *mg, int nodeid);
-void retrieve_plocks(struct mountgroup *mg);
-int dump_plocks(char *name, int fd);
-void process_saved_plocks(struct mountgroup *mg);
-void purge_plocks(struct mountgroup *mg, int nodeid, int unmount);
-int unlink_checkpoint(struct mountgroup *mg);
-void update_dmsetup_wait(void);
-
 #endif