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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-01-05 16:36:55 -0600 (Wed, 05 Jan 2005)
New Revision: 1742

Modified:
   trunk/src/ocfs.h
   trunk/src/proc.c
Log:
* remove some unused code



Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2005-01-05 19:28:07 UTC (rev 1741)
+++ trunk/src/ocfs.h	2005-01-05 22:36:55 UTC (rev 1742)
@@ -109,7 +109,6 @@
 #include "ocfs2_fs.h"
 
 typedef struct _ocfs_super ocfs_super;
-typedef struct _ocfs_lock_res ocfs_lock_res;
 
 /* this limits us to 256 nodes
  * if we need more, we can do a kmalloc for the map */
@@ -261,9 +260,6 @@
 #define SET_INODE_JOURNAL(i) (OCFS_I(i)->ip_flags |= OCFS_INODE_JOURNAL)
 #define CLEAR_INODE_JOURNAL(i) (OCFS_I(i)->ip_flags &= (~OCFS_INODE_JOURNAL))
 
-
-#define GET_INODE_LOCKRES(i) ({ if (i==NULL) BUG(); (&(OCFS_I(i)->ip_lockres)); })
-
 typedef enum _ocfs_vol_state
 {
 	VOLUME_INIT = 0,
@@ -279,18 +275,6 @@
 	struct task_struct *c_task;
 } ocfs_commit_task;
 
-typedef struct _ocfs_dlm_stats
-{
-	atomic_t total;
-	atomic_t okay;
-	atomic_t etimedout;
-	atomic_t efail;
-	atomic_t eagain;
-	atomic_t enoent;
-	atomic_t def;
-}
-ocfs_dlm_stats;
-
 typedef struct _ocfs_alloc_stats
 {
 	atomic_t moves;
@@ -374,8 +358,6 @@
 	int dirty;
 	ocfs2_dinode *local_alloc_copy;
 
-	ocfs_dlm_stats net_reqst_stats;	/* stats of netdlm vote requests */
-	ocfs_dlm_stats net_reply_stats;	/* stats of netdlm vote reponses */
 	ocfs_alloc_stats alloc_stats;
 	char dev_str[20];		/* "major,minor" of the device */
 
@@ -417,8 +399,6 @@
 	kmem_cache_t *lock_cache;
 	u32 flags;
 	char *node_name;		/* human readable node identification */
-	ocfs_dlm_stats net_reqst_stats;	/* stats of netdlm vote requests */
-	ocfs_dlm_stats net_reply_stats;	/* stats of netdlm vote reponses */
 	struct proc_dir_entry *proc_root_dir; /* points to /proc/fs/ocfs2 */
 }
 ocfs_global_ctxt;

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2005-01-05 19:28:07 UTC (rev 1741)
+++ trunk/src/proc.c	2005-01-05 22:36:55 UTC (rev 1742)
@@ -48,7 +48,6 @@
 
 #define OCFS2_PROC_BASENAME	"fs/ocfs2"
 
-static int ocfs_proc_dlm_stats(char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_version (char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_nodenum (char *page, char **start, off_t off, int count, int *eof, void *data);
 static int ocfs_proc_slotnum (char *page, char **start, off_t off, int count, int *eof, void *data);
@@ -70,7 +69,6 @@
 ocfs_proc_list top_dir[] = {
 	{ "version", NULL, ocfs_proc_version },
 	{ "nodename", NULL, ocfs_proc_nodename },
-	{ "lockstat", NULL, ocfs_proc_dlm_stats },
 	{ NULL } };
 
 ocfs_proc_list sub_dir[] = {
@@ -78,7 +76,6 @@
 	{ "mountpoint", NULL, ocfs_proc_mountpoint },
 	{ "slotnum", NULL, ocfs_proc_slotnum },
 	{ "statistics", NULL, ocfs_proc_statistics },
-	{ "lockstat", NULL, ocfs_proc_dlm_stats },
 	{ "device", NULL, ocfs_proc_device },
 	{ "nodes", NULL, ocfs_proc_nodes },
 	{ "allocstat", NULL, ocfs_proc_alloc_stat },
@@ -155,54 +152,6 @@
 }				/* ocfs_proc_calc_metrics */
 
 /*
- * ocfs_proc_dlm_stats()
- *
- */
-static int ocfs_proc_dlm_stats(char *page, char **start, off_t off,
-			       int count, int *eof, void *data)
-{
-	int len;
-	int ret;
-	ocfs_super *osb;
-	ocfs_dlm_stats *nrq;
-	ocfs_dlm_stats *nrp;
-
-	LOG_ENTRY ();
-
-#define DLM_STATS_HDR	"%-25s %10s %10s %10s %10s %10s %10s %10s\n"
-#define DLM_STATS	"%-25s %10d %10d %10d %10d %10d %10d %10d\n"
-
-	osb = data;
-	if (osb) {
-		nrq = &(osb->net_reqst_stats);
-		nrp = &(osb->net_reply_stats);
-	} else {
-		nrq = &(OcfsGlobalCtxt.net_reqst_stats);
-		nrp = &(OcfsGlobalCtxt.net_reply_stats);
-	}
-
-	len = sprintf (page, DLM_STATS_HDR, " ", "total", "okay", "etimedout",
-		       "eagain", "efail", "enoent", "others");
-
-	len += sprintf (page + len, DLM_STATS, "netdlm vote requests",
-			atomic_read (&nrq->total), atomic_read (&nrq->okay),
-			atomic_read (&nrq->etimedout), atomic_read (&nrq->eagain),
-			atomic_read (&nrq->efail), atomic_read (&nrq->enoent),
-			atomic_read (&nrq->def));
-
-	len += sprintf (page + len, DLM_STATS, "netdlm vote responses",
-		       	atomic_read (&nrp->total), atomic_read (&nrp->okay),
-		       	atomic_read (&nrp->etimedout), atomic_read (&nrp->eagain),
-		       	atomic_read (&nrp->efail), atomic_read (&nrp->enoent),
-		       	atomic_read (&nrp->def));
-
-	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
-
-	LOG_EXIT_INT (ret);
-	return ret;
-}				/* ocfs_proc_dlm_stats */
-
-/*
  * ocfs_proc_alloc_stat()
  *
  */