[Ocfs2-commits] mfasheh commits r804 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-22 12:41:59 -0600 (Mon, 22 Mar 2004)
New Revision: 804

Modified:
   trunk/src/inc/ocfs.h
   trunk/src/osb.c
Log:
* more cleanup. get rid of these unused fields:
	osb->in_voting
	osb->vol_lock_res



Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-03-20 02:10:01 UTC (rev 803)
+++ trunk/src/inc/ocfs.h	2004-03-22 18:41:59 UTC (rev 804)
@@ -2030,10 +2030,8 @@
 	atomic_t node_req_vote;         /* set when node's vote req pending */
 	struct semaphore trans_lock;	/* serializes transactions */
 	bool publish_dirty;
-	__u32 in_voting;
 	ocfs_sem voting_lock;
 	struct list_head needs_flush_head;
-	ocfs_sem vol_lock_res;
 	wait_queue_head_t flush_event;
 	atomic_t flush_event_woken;
 	struct _ocfs_journal journal;

Modified: trunk/src/osb.c
===================================================================
--- trunk/src/osb.c	2004-03-20 02:10:01 UTC (rev 803)
+++ trunk/src/osb.c	2004-03-22 18:41:59 UTC (rev 804)
@@ -100,7 +100,6 @@
 	atomic_set (&osb->nm_init, 0);
 
 	osb->publish_dirty = false;
-	osb->in_voting = NOT_VOTING;
 	ocfs_init_sem (&(osb->voting_lock));
 	init_waitqueue_head (&osb->flush_event);
 	atomic_set (&osb->flush_event_woken, 0);