[Ocfs2-commits] smushran commits r2829 - branches/ocfs2-1.2-cert/patches

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: khackel
Date: 2006-04-06 17:04:25 -0500 (Thu, 06 Apr 2006)
New Revision: 2829

Modified:
   branches/ocfs2-1.2-cert/patches/dlm-new_proc_entry
   branches/ocfs2-1.2-cert/patches/series
Log:
fix patch dlm-new_proc_entry
Signed-off-by: khackel

Modified: branches/ocfs2-1.2-cert/patches/dlm-new_proc_entry
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-new_proc_entry	2006-04-06 21:36:23 UTC (rev 2828)
+++ branches/ocfs2-1.2-cert/patches/dlm-new_proc_entry	2006-04-06 22:04:25 UTC (rev 2829)
@@ -1,8 +1,8 @@
 Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdebug.c	2006-03-27 14:36:39.586328000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c	2006-03-31 17:51:22.556100000 -0800
-@@ -58,6 +58,9 @@
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdebug.c	2006-04-06 14:36:26.180619000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c	2006-04-06 14:36:28.125977000 -0700
+@@ -58,6 +58,9 @@ static int dlm_parse_domain_and_lockres(
  					struct dlm_ctxt **dlm,
  					struct dlm_lock_resource **res);
  
@@ -12,7 +12,7 @@
  typedef int (dlm_debug_func_t)(const char __user *data, unsigned int len);
  
  struct dlm_debug_funcs
-@@ -114,6 +117,8 @@
+@@ -114,6 +117,8 @@ static struct file_operations dlm_debug_
  
  #define OCFS2_DLM_PROC_PATH "fs/ocfs2_dlm"
  #define DLM_DEBUG_PROC_NAME "debug"
@@ -21,7 +21,7 @@
  static struct proc_dir_entry *ocfs2_dlm_proc;
  
  void dlm_remove_proc(void)
-@@ -140,6 +145,52 @@
+@@ -140,6 +145,52 @@ void dlm_init_proc(void)
  		entry->proc_fops = &dlm_debug_operations;
  }
  
@@ -77,7 +77,7 @@
 Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.h
 ===================================================================
 --- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdebug.h	2006-03-27 14:36:39.750164000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.h	2006-03-31 17:20:26.337700000 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.h	2006-04-06 14:36:28.131977000 -0700
 @@ -28,5 +28,7 @@
  void dlm_remove_proc(void);
  void dlm_init_proc(void);
@@ -88,9 +88,9 @@
  #endif
 Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c	2006-03-31 16:30:30.666046000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c	2006-03-31 17:43:23.458380000 -0800
-@@ -193,6 +193,8 @@
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c	2006-04-06 14:36:27.193298000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c	2006-04-06 14:36:28.145978000 -0700
+@@ -193,6 +193,8 @@ static int dlm_wait_on_domain_helper(con
  
  static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm)
  {
@@ -99,7 +99,7 @@
  	if (dlm->lockres_hash)
  		free_page((unsigned long) dlm->lockres_hash);
  
-@@ -1267,6 +1269,8 @@
+@@ -1278,6 +1280,8 @@ static struct dlm_ctxt *dlm_alloc_ctxt(c
  
  	INIT_LIST_HEAD(&dlm->dlm_eviction_callbacks);
  
@@ -108,3 +108,16 @@
  	mlog(0, "context init: refcount %u\n",
  		  atomic_read(&dlm->dlm_refs.refcount));
  
+Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmcommon.h
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmcommon.h	2006-04-06 14:36:27.176298000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmcommon.h	2006-04-06 15:00:08.719305000 -0700
+@@ -107,6 +107,8 @@ struct dlm_ctxt
+ 	struct list_head master_list;
+ 	struct list_head mle_hb_events;
+ 
++	struct proc_dir_entry *dlm_proc;
++
+ 	/* these give a really vague idea of the system load */
+ 	atomic_t local_resources;
+ 	atomic_t remote_resources;

Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series	2006-04-06 21:36:23 UTC (rev 2828)
+++ branches/ocfs2-1.2-cert/patches/series	2006-04-06 22:04:25 UTC (rev 2829)
@@ -31,4 +31,4 @@
 hb-add_tracking_around_configured_nodes 
 jrnl-change_gfp_kernel_to_nofs 
 debug-bad-recovery.patch 
-dlm-new_proc_entry
+dlm-new_proc_entry