[Ocfs2-commits] jlbec commits r1588 - trunk/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-10-22 16:48:18 -0500 (Fri, 22 Oct 2004)
New Revision: 1588

Modified:
   trunk/src/ocfs.h
   trunk/src/proc.c
   trunk/src/super.c
Log:
o Remove a few unused ocfs_super fields

Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-10-22 21:35:48 UTC (rev 1587)
+++ trunk/src/ocfs.h	2004-10-22 21:48:18 UTC (rev 1588)
@@ -519,9 +519,7 @@
 	struct task_struct *dlm_task;
 	ocfs_commit_task *commit;
 	__u32 osb_flags;
-	__s64 file_open_cnt;	/* num of open files/dirs. vol cannot be dismounted if > 0 */
 	ocfs_node_map publ_map;
-	struct list_head cache_lock_list;
 	struct super_block *sb;
 	struct inode *root_inode;
 	struct inode *sys_root_inode;
@@ -589,7 +587,6 @@
 	struct semaphore publish_lock;  /* protects r/w to publish sector */
 	atomic_t node_req_vote;         /* set when node's vote req pending */
 	int publish_dirty;
-	struct list_head needs_flush_head;
 	wait_queue_head_t flush_event;
 	atomic_t flush_event_woken;
 	struct _ocfs_journal *journal;

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-10-22 21:35:48 UTC (rev 1587)
+++ trunk/src/proc.c	2004-10-22 21:48:18 UTC (rev 1588)
@@ -455,7 +455,6 @@
 		*(ptr - 1) = '\0';
 
 #define PROC_STATS                             \
-  "File open count          : %lld\n"		\
   "Publish map              : %s\n"		\
   "Number of nodes          : %u\n"		\
   "Cluster size             : %d\n"		\
@@ -466,7 +465,7 @@
   "Delayed Locks            : %u\n"		\
   "Checkpointing Locks      : %u\n"
 
-	len = sprintf (page, PROC_STATS, osb->file_open_cnt, pubmap,
+	len = sprintf (page, PROC_STATS,
 		       osb->num_nodes, osb->s_clustersize, 
 		       ocfs2_clusters_to_bytes(osb->sb, osb->cluster_bitmap.validbits),
 		       osb->cluster_bitmap.failed, 

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-10-22 21:35:48 UTC (rev 1587)
+++ trunk/src/super.c	2004-10-22 21:48:18 UTC (rev 1588)
@@ -1117,18 +1117,6 @@
 	down(&(osb->osb_res));
 	AcquiredOSB = 1;
 
-#ifdef UMOUNT_CHECK
-	if (osb->file_open_cnt > 0) {
-		LOG_ERROR_ARGS ("Dismount failed... file_open_cnt(%d) > 0",
-				osb->file_open_cnt);
-		LOG_ERROR_STR
-		    ("WARNING!!! Need to uncomment this when file opens are correct!\n");
-/*      commenting this out for now until we deal with open files properly */
-		status = -EBUSY;
-		goto leave;
-	}
-#endif
-
 	ocfs_shutdown_local_alloc(osb);
 	ocfs_journal_shutdown(osb);
 
@@ -1483,8 +1471,6 @@
 	spin_lock_init (&osb->vote_obj_queue_lock);
 
 	INIT_LIST_HEAD (&(osb->vote_obj_queue));
-	INIT_LIST_HEAD (&(osb->cache_lock_list));
-	INIT_LIST_HEAD (&(osb->needs_flush_head));
 	for (i=0; i<osb->max_nodes; i++) {
 		INIT_LIST_HEAD(&(osb->lock_recovery_lists[i]));
 	}