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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-06-17 21:18:13 -0500 (Thu, 17 Jun 2004)
New Revision: 1142

Modified:
   trunk/src/ocfs.h
   trunk/src/proc.c
Log:
* remove some ocfs inode hash remnants

* remove some dir alloc remnants



Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-06-18 02:05:55 UTC (rev 1141)
+++ trunk/src/ocfs.h	2004-06-18 02:18:13 UTC (rev 1142)
@@ -666,27 +666,6 @@
 
 struct _ocfs_bitmap_free_head;
 
-typedef struct _ocfs_inode_hash {
-	spinlock_t        lock;     /* protects the whole hash */
-	int               size;     /* number of lists in the hash */
-	unsigned int      num_ents; /* global number of offsets in there */
-	struct list_head  *hash; 
-} ocfs_inode_hash;
-
-typedef struct _ocfs_inode_num {
-	enum {
-		INUM_UNBOUND = 0,  /* unbound to an inode*/
-		INUM_BOUND         /* we have an inode attached. */
-	}                 i_state;
-	struct list_head  i_list;
-	unsigned long     i_ino;
-	__u64             i_feoff;  /* used only for directory inodes,
-				     * points to parent fe of
-				     * dirnode. for files i_voteoff == i_feoff,
-				     * for root directory this is 0 */
-	struct inode     *i_inode;  /* may be null! */
-} ocfs_inode_num;
-
 typedef struct _ocfs_commit_task
 {
 	struct completion c_complete;
@@ -713,8 +692,6 @@
 	atomic_t local_data;
 	atomic_t bitmap_data;
 	atomic_t bitmap_meta;
-	atomic_t dir_allocs;
-	atomic_t dir_extends;
 	atomic_t ext_allocs;
 	atomic_t ext_extends;
 } ocfs_alloc_stats;
@@ -811,7 +788,6 @@
 	__u64 *last_publ_seq_num;
 	int have_local_alloc;
 	struct buffer_head *local_alloc_bh;
-	ocfs_inode_hash inode_hash;
 	struct semaphore extend_sem;
 	__u8 check_mounted; /* tell nm to check mounted flag, protected by publish_lock*/
 	ocfs_dlm_stats net_reqst_stats;	/* stats of netdlm vote requests */

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-06-18 02:05:55 UTC (rev 1141)
+++ trunk/src/proc.c	2004-06-18 02:18:13 UTC (rev 1142)
@@ -266,10 +266,6 @@
 	len += sprintf (page + len, "\n%s\n", "(Metadata Allocs)");
 	len += sprintf (page + len, ALLOC_STATS_HDR, "Bitmap Allocs", 
 			atomic_read (&osb->alloc_stats.bitmap_meta));
-	len += sprintf (page + len, ALLOC_STATS_HDR, "Dir Node Allocs", 
-			atomic_read (&osb->alloc_stats.dir_allocs));
-	len += sprintf (page + len, ALLOC_STATS_HDR, "Dir Node Extends", 
-			atomic_read (&osb->alloc_stats.dir_extends));
 	len += sprintf (page + len, ALLOC_STATS_HDR, "Ext Node Allocs", 
 			atomic_read (&osb->alloc_stats.ext_allocs));
 	len += sprintf (page + len, ALLOC_STATS_HDR, "Ext Node Extends", 
@@ -510,15 +506,13 @@
   "Cluster size             : %d\n"		\
   "Volume size              : %llu\n"		\
   "Failed Large Allocs      : %u\n"		\
-  "Retry Large Allocs       : %u\n"		\
-  "Inode Hash Objects       : %u\n"
+  "Retry Large Allocs       : %u\n"
 
 	len = sprintf (page, PROC_STATS, osb->file_open_cnt, pubmap,
 		       osb->num_nodes, osb->s_clustersize, 
 		       (u64)osb->cluster_bitmap.validbits << osb->s_clustersize_bits,
 		       osb->cluster_bitmap.failed, 
-		       osb->cluster_bitmap.ok_retries, 
-		       osb->inode_hash.num_ents);
+		       osb->cluster_bitmap.ok_retries);
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);