[Ocfs2-commits] smushran commits r2801 - branches/ocfs2-1.2-cert/patches
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Thu Mar 30 18:49:38 CST 2006
Author: smushran
Signed-off-by: khackel
Date: 2006-03-30 18:49:37 -0600 (Thu, 30 Mar 2006)
New Revision: 2801
Added:
branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk
branches/ocfs2-1.2-cert/patches/ocfs2-1.2-net-proc-id-0.patch
Modified:
branches/ocfs2-1.2-cert/patches/series
Log:
patches dlm-mlog_to_printk and ocfs2-1.2-net-proc-id-0.patch added
Signed-off-by: khackel
Added: branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk 2006-03-31 00:17:30 UTC (rev 2800)
+++ branches/ocfs2-1.2-cert/patches/dlm-mlog_to_printk 2006-03-31 00:49:37 UTC (rev 2801)
@@ -0,0 +1,38 @@
+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
+@@ -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);
+
+ 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)
+@@ -402,7 +403,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);
+
+ spin_lock(&dlm->spinlock);
+ clear_bit(node, dlm->domain_map);
+@@ -651,6 +652,8 @@
+ 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",
++ assert->node_idx, dlm->name);
+ __dlm_print_nodes(dlm);
+
+ /* notify anything attached to the heartbeat events */
Added: branches/ocfs2-1.2-cert/patches/ocfs2-1.2-net-proc-id-0.patch
===================================================================
--- branches/ocfs2-1.2-cert/patches/ocfs2-1.2-net-proc-id-0.patch 2006-03-31 00:17:30 UTC (rev 2800)
+++ branches/ocfs2-1.2-cert/patches/ocfs2-1.2-net-proc-id-0.patch 2006-03-31 00:49:37 UTC (rev 2801)
@@ -0,0 +1,124 @@
+Index: fs/ocfs2/cluster/net_proc.c
+===================================================================
+--- fs/ocfs2/cluster/net_proc.c (revision 2794)
++++ fs/ocfs2/cluster/net_proc.c (working copy)
+@@ -117,6 +117,7 @@ static int nst_seq_show(struct seq_file
+ " process name: %s\n"
+ " node: %u\n"
+ " sc: %p\n"
++ " message id: %d\n"
+ " message type: %u\n"
+ " message key: 0x%08x\n"
+ " sock acquiry: %lu.%lu\n"
+@@ -125,7 +126,8 @@ static int nst_seq_show(struct seq_file
+ nst, (unsigned long)nst->st_task->pid,
+ (unsigned long)nst->st_task->tgid,
+ nst->st_task->comm, nst->st_node,
+- nst->st_sc, nst->st_msg_type, nst->st_msg_key,
++ nst->st_sc, nst->st_id, nst->st_msg_type,
++ nst->st_msg_key,
+ nst->st_sock_time.tv_sec, nst->st_sock_time.tv_usec,
+ nst->st_send_time.tv_sec, nst->st_send_time.tv_usec,
+ nst->st_status_time.tv_sec,
+@@ -253,6 +255,8 @@ static void *sc_seq_next(struct seq_file
+ return sc; /* unused, just needs to be null when done */
+ }
+
++#define TV_SEC_USEC(TV) TV.tv_sec, TV.tv_usec
++
+ static int sc_seq_show(struct seq_file *seq, void *v)
+ {
+ struct o2net_sock_container *sc, *dummy_sc = seq->private;
+@@ -285,11 +289,31 @@ static int sc_seq_show(struct seq_file *
+ " krefs: %d\n"
+ " sock: %u.%u.%u.%u:%u -> %u.%u.%u.%u:%u\n"
+ " remote node: %s\n"
+- " page off: %zu\n",
+- sc, atomic_read(&sc->sc_kref.refcount),
++ " page off: %zu\n"
++ " handshake ok: %u\n"
++ " timer: %lu.%lu\n"
++ " data ready: %lu.%lu\n"
++ " advance start: %lu.%lu\n"
++ " advance stop: %lu.%lu\n"
++ " func start: %lu.%lu\n"
++ " func stop: %lu.%lu\n"
++ " func key: %u\n"
++ " func type: %u\n",
++ sc,
++ atomic_read(&sc->sc_kref.refcount),
+ NIPQUAD(saddr), inet ? ntohs(sport) : 0,
+- NIPQUAD(daddr), inet ? ntohs(dport) : 0,
+- sc->sc_node->nd_name, sc->sc_page_off);
++ NIPQUAD(daddr), inet ? ntohs(dport) : 0,
++ sc->sc_node->nd_name,
++ sc->sc_page_off,
++ sc->sc_handshake_ok,
++ TV_SEC_USEC(sc->sc_tv_timer),
++ TV_SEC_USEC(sc->sc_tv_data_ready),
++ TV_SEC_USEC(sc->sc_tv_advance_start),
++ TV_SEC_USEC(sc->sc_tv_advance_stop),
++ TV_SEC_USEC(sc->sc_tv_func_start),
++ TV_SEC_USEC(sc->sc_tv_func_stop),
++ sc->sc_msg_key,
++ sc->sc_msg_type);
+ }
+
+
+Index: fs/ocfs2/cluster/tcp.c
+===================================================================
+--- fs/ocfs2/cluster/tcp.c (revision 2794)
++++ fs/ocfs2/cluster/tcp.c (working copy)
+@@ -184,7 +184,8 @@ static int o2net_prep_nsw(struct o2net_n
+ }
+ spin_lock(&nn->nn_lock);
+ #ifndef IDR_GET_NEW_RETURNS_ID
+- ret = idr_get_new(&nn->nn_status_idr, nsw, &nsw->ns_id);
++ ret = idr_get_new_above(&nn->nn_status_idr, nsw,
++ nn->nn_status_next_id, &nsw->ns_id);
+ #else
+ /* old semantics */
+ nsw->ns_id = idr_get_new(&nn->nn_status_idr, nsw);
+@@ -193,9 +194,11 @@ static int o2net_prep_nsw(struct o2net_n
+ else
+ ret = 0;
+ #endif
+- if (ret == 0)
+- list_add_tail(&nsw->ns_node_item,
+- &nn->nn_status_list);
++ if (ret == 0) {
++ list_add_tail(&nsw->ns_node_item, &nn->nn_status_list);
++ if (++nn->nn_status_next_id == INT_MAX)
++ nn->nn_status_next_id = 0;
++ }
+ spin_unlock(&nn->nn_lock);
+ } while (ret == -EAGAIN);
+
+@@ -956,6 +959,7 @@ int o2net_send_message_vec(u32 msg_type,
+ goto out;
+
+ msg->msg_num = cpu_to_be32(nsw.ns_id);
++ nst.st_id = nsw.ns_id;
+
+ do_gettimeofday(&nst.st_send_time);
+ /* finally, convert the message header to network byte-order
+Index: fs/ocfs2/cluster/tcp_internal.h
+===================================================================
+--- fs/ocfs2/cluster/tcp_internal.h (revision 2794)
++++ fs/ocfs2/cluster/tcp_internal.h (working copy)
+@@ -62,6 +62,7 @@ struct o2net_node {
+ * or fails or when an accepted socket is attached. */
+ wait_queue_head_t nn_sc_wq;
+
++ int nn_status_next_id;
+ struct idr nn_status_idr;
+ struct list_head nn_status_list;
+
+@@ -170,6 +171,7 @@ struct o2net_send_tracking {
+ struct list_head st_net_proc_item;
+ struct task_struct *st_task;
+ struct o2net_sock_container *st_sc;
++ int st_id;
+ u32 st_msg_type;
+ u32 st_msg_key;
+ u8 st_node;
Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series 2006-03-31 00:17:30 UTC (rev 2800)
+++ branches/ocfs2-1.2-cert/patches/series 2006-03-31 00:49:37 UTC (rev 2801)
@@ -21,3 +21,5 @@
reassert-vs-migration.patch
fix-remote-lock-during-reco.patch
fix-death-during-recovery.patch
+ocfs2-1.2-net-proc-id-0.patch -p0
+dlm-mlog_to_printk
More information about the Ocfs2-commits
mailing list