Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 781ee3e2 authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

ocfs2: Cleanup message prints 



Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent a43db30c

fs/ocfs2/cluster/tcp.c

+7 −7
Original line number Diff line number Diff line
@@ -396,8 +396,8 @@ static void o2net_set_nn_state(struct o2net_node *nn, 
	}



	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);

	}
@@ -409,7 +409,7 @@ static void o2net_set_nn_state(struct o2net_node *nn, 
		 * 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", 

		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));
@@ -1280,7 +1280,7 @@ static void o2net_idle_timer(unsigned long data) 


	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 "

fs/ocfs2/dlm/dlmdomain.c

+6 −3
Original line number Diff line number Diff line
@@ -408,12 +408,13 @@ static void __dlm_print_nodes(struct dlm_ctxt *dlm) 


	assert_spin_locked(&dlm->spinlock);



	mlog(ML_NOTICE, "Nodes in my domain (\"%s\"):\n", 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) {

		mlog(ML_NOTICE, " node %d\n", node);

		printk("%d ", node);

	}

	printk("\n");

}



static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data)
@@ -429,7 +430,7 @@ static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data) 


	node = exit_msg->node_idx;



	mlog(0, "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);
@@ -678,6 +679,8 @@ static int dlm_assert_joined_handler(struct o2net_msg *msg, u32 len, void *data) 
		set_bit(assert->node_idx, dlm->domain_map);

		__dlm_set_joining_node(dlm, DLM_LOCK_RES_OWNER_UNKNOWN);



		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 */

fs/ocfs2/super.c

+7 −8
Original line number Diff line number Diff line
@@ -642,10 +642,9 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) 


	ocfs2_complete_mount_recovery(osb);



	printk("ocfs2: Mounting device (%u,%u) on (node %d, slot %d) with %s "

	       "data mode.\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) "

	       "with %s data mode.\n",

	       osb->dev_str, osb->node_num, osb->slot_num,

	       osb->s_mount_opt & OCFS2_MOUNT_DATA_WRITEBACK ? "writeback" :

	       "ordered");
@@ -1020,7 +1019,7 @@ static int ocfs2_fill_local_node_info(struct ocfs2_super *osb) 
		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:
@@ -1191,8 +1190,8 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err) 


	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);
@@ -1327,7 +1326,7 @@ static int ocfs2_initialize_super(struct super_block *sb, 
		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,