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

svn-commits@oss.oracle.com svn-commits at oss.oracle.com
Fri Mar 31 18:30:30 CST 2006


Author: smushran
Signed-off-by: khackel
Date: 2006-03-31 18:30:29 -0600 (Fri, 31 Mar 2006)
New Revision: 2804

Modified:
   branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk
Log:
dlm-mlog_to_printk patch improved
Signed-off-by: khackel

Modified: branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk	2006-03-31 17:55:51 UTC (rev 2803)
+++ branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk	2006-04-01 00:30:29 UTC (rev 2804)
@@ -1,13 +1,13 @@
 Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c
 ===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c	2006-03-30 10:41:46.088571000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c	2006-03-30 11:28:39.717049000 -0800
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c	2006-03-27 14:36:39.314361000 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c	2006-03-31 15:31:03.547719000 -0800
 @@ -381,12 +381,13 @@
  
  	assert_spin_locked(&dlm->spinlock);
  
 -	mlog(ML_NOTICE, "Nodes in my domain (\"%s\"):\n", dlm->name);
-+	printk(KERN_INFO "ocfs2: Nodes in domain (\"%s\"): ", dlm->name);
++	printk(KERN_INFO "ocfs2_dlm: Nodes in domain (\"%s\"): ", dlm->name);
  
  	while ((node = find_next_bit(dlm->domain_map, O2NM_MAX_NODES,
  				     node + 1)) < O2NM_MAX_NODES) {
@@ -23,7 +23,7 @@
  	node = exit_msg->node_idx;
  
 -	mlog(0, "Node %u leaves domain %s\n", node, dlm->name);
-+	printk(KERN_INFO "ocfs2: Node %u leaves domain %s\n", node, dlm->name);
++	printk(KERN_INFO "ocfs2_dlm: Node %u leaves domain %s\n", node, dlm->name);
  
  	spin_lock(&dlm->spinlock);
  	clear_bit(node, dlm->domain_map);
@@ -31,8 +31,105 @@
  		set_bit(assert->node_idx, dlm->domain_map);
  		__dlm_set_joining_node(dlm, DLM_LOCK_RES_OWNER_UNKNOWN);
  
-+		printk(KERN_INFO "ocfs2: Node %u joins domain %s\n",
++		printk(KERN_INFO "ocfs2_dlm: Node %u joins domain %s\n",
 +		       assert->node_idx, dlm->name);
  		__dlm_print_nodes(dlm);
  
  		/* notify anything attached to the heartbeat events */
+Index: ocfs2-1.2-cert/fs/ocfs2/super.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/super.c	2006-03-27 14:36:41.121721000 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/super.c	2006-03-31 15:31:03.571697000 -0800
+@@ -641,9 +641,8 @@
+ 
+ 	ocfs2_complete_mount_recovery(osb);
+ 
+-	printk("ocfs2: Mounting device (%u,%u) on (node %d, slot %d)\n",
+-	       MAJOR(sb->s_dev), MINOR(sb->s_dev), osb->node_num,
+-	       osb->slot_num);
++	printk(KERN_INFO "ocfs2: Mounting device (%s) on (node %d, slot %d)\n",
++	       osb->dev_str, osb->node_num, osb->slot_num);
+ 
+ 	atomic_set(&osb->vol_state, VOLUME_MOUNTED);
+ 	wake_up(&osb->osb_mount_event);
+@@ -1028,7 +1027,7 @@
+ 		goto bail;
+ 	}
+ 
+-	mlog(ML_NOTICE, "I am node %d\n", osb->node_num);
++	mlog(0, "I am node %d\n", osb->node_num);
+ 
+ 	status = 0;
+ bail:
+@@ -1208,8 +1207,8 @@
+ 
+ 	atomic_set(&osb->vol_state, VOLUME_DISMOUNTED);
+ 
+-	printk("ocfs2: Unmounting device (%u,%u) on (node %d)\n",
+-	       MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev), osb->node_num);
++	printk(KERN_INFO "ocfs2: Unmounting device (%s) on (node %d)\n",
++	       osb->dev_str, osb->node_num);
+ 
+ 	ocfs2_delete_osb(osb);
+ 	kfree(osb);
+@@ -1351,7 +1350,7 @@
+ 		status = -EINVAL;
+ 		goto bail;
+ 	}
+-	mlog(ML_NOTICE, "max_slots for this device: %u\n", osb->max_slots);
++	mlog(0, "max_slots for this device: %u\n", osb->max_slots);
+ 
+ 	init_waitqueue_head(&osb->osb_wipe_event);
+ 	osb->osb_orphan_wipes = kcalloc(osb->max_slots,
+Index: ocfs2-1.2-cert/fs/ocfs2/slot_map.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/slot_map.c	2006-03-27 14:36:43.062080000 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/slot_map.c	2006-03-31 15:31:03.582690000 -0800
+@@ -264,7 +264,7 @@
+ 	osb->slot_num = slot;
+ 	spin_unlock(&si->si_lock);
+ 
+-	mlog(ML_NOTICE, "taking node slot %d\n", osb->slot_num);
++	mlog(0, "taking node slot %d\n", osb->slot_num);
+ 
+ 	status = ocfs2_update_disk_slots(osb, si);
+ 	if (status < 0)
+Index: ocfs2-1.2-cert/fs/ocfs2/cluster/tcp.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/tcp.c	2006-03-31 15:31:03.232846000 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/cluster/tcp.c	2006-03-31 16:07:42.029687000 -0800
+@@ -410,8 +410,8 @@
+ 	}
+ 
+ 	if (was_valid && !valid) {
+-		mlog(ML_NOTICE, "no longer connected to " SC_NODEF_FMT "\n",
+-		     SC_NODEF_ARGS(old_sc));
++		printk(KERN_INFO "o2net: no longer connected to "
++		       SC_NODEF_FMT "\n", SC_NODEF_ARGS(old_sc));
+ 		o2net_complete_nodes_nsw(nn);
+ 	}
+ 
+@@ -423,10 +423,10 @@
+ 		 * the only way to start connecting again is to down
+ 		 * heartbeat and bring it back up. */
+ 		cancel_delayed_work(&nn->nn_connect_expired);
+-		mlog(ML_NOTICE, "%s " SC_NODEF_FMT "\n", 
+-		     o2nm_this_node() > sc->sc_node->nd_num ?
+-		     	"connected to" : "accepted connection from",
+-		     SC_NODEF_ARGS(sc));
++		printk(KERN_INFO "o2net: %s " SC_NODEF_FMT "\n",
++		       o2nm_this_node() > sc->sc_node->nd_num ?
++		       		"connected to" : "accepted connection from",
++		       SC_NODEF_ARGS(sc));
+ 	}
+ 
+ 	/* trigger the connecting worker func as long as we're not valid,
+@@ -1310,7 +1310,7 @@
+ 
+ 	do_gettimeofday(&now);
+ 
+-	mlog(ML_NOTICE, "connection to " SC_NODEF_FMT " has been idle for 10 "
++	printk(KERN_INFO "o2net: connection to " SC_NODEF_FMT " has been idle for 10 "
+ 	     "seconds, shutting it down.\n", SC_NODEF_ARGS(sc));
+ 	mlog(ML_NOTICE, "here are some times that might help debug the "
+ 	     "situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv "




More information about the Ocfs2-commits mailing list