Commit 81889255 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland

fs: dlm: rename seq to h_seq for msg tracing

This patch renames seq to h_seq as it is named in the dlm header
structure.
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 554d8496
...@@ -342,12 +342,12 @@ TRACE_EVENT(dlm_unlock_end, ...@@ -342,12 +342,12 @@ TRACE_EVENT(dlm_unlock_end,
DECLARE_EVENT_CLASS(dlm_rcom_template, DECLARE_EVENT_CLASS(dlm_rcom_template,
TP_PROTO(uint32_t seq, const struct dlm_rcom *rc), TP_PROTO(uint32_t h_seq, const struct dlm_rcom *rc),
TP_ARGS(seq, rc), TP_ARGS(h_seq, rc),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(uint32_t, seq) __field(uint32_t, h_seq)
__field(uint32_t, h_version) __field(uint32_t, h_version)
__field(uint32_t, h_lockspace) __field(uint32_t, h_lockspace)
__field(uint32_t, h_nodeid) __field(uint32_t, h_nodeid)
...@@ -363,7 +363,7 @@ DECLARE_EVENT_CLASS(dlm_rcom_template, ...@@ -363,7 +363,7 @@ DECLARE_EVENT_CLASS(dlm_rcom_template,
), ),
TP_fast_assign( TP_fast_assign(
__entry->seq = seq; __entry->h_seq = h_seq;
__entry->h_version = le32_to_cpu(rc->rc_header.h_version); __entry->h_version = le32_to_cpu(rc->rc_header.h_version);
__entry->h_lockspace = le32_to_cpu(rc->rc_header.u.h_lockspace); __entry->h_lockspace = le32_to_cpu(rc->rc_header.u.h_lockspace);
__entry->h_nodeid = le32_to_cpu(rc->rc_header.h_nodeid); __entry->h_nodeid = le32_to_cpu(rc->rc_header.h_nodeid);
...@@ -378,10 +378,10 @@ DECLARE_EVENT_CLASS(dlm_rcom_template, ...@@ -378,10 +378,10 @@ DECLARE_EVENT_CLASS(dlm_rcom_template,
__get_dynamic_array_len(rc_buf)); __get_dynamic_array_len(rc_buf));
), ),
TP_printk("seq=%u, h_version=%s h_lockspace=%u h_nodeid=%u " TP_printk("h_seq=%u h_version=%s h_lockspace=%u h_nodeid=%u "
"h_length=%u h_cmd=%s rc_type=%s rc_result=%d " "h_length=%u h_cmd=%s rc_type=%s rc_result=%d "
"rc_id=%llu rc_seq=%llu rc_seq_reply=%llu " "rc_id=%llu rc_seq=%llu rc_seq_reply=%llu "
"rc_buf=0x%s", __entry->seq, "rc_buf=0x%s", __entry->h_seq,
show_message_version(__entry->h_version), show_message_version(__entry->h_version),
__entry->h_lockspace, __entry->h_nodeid, __entry->h_length, __entry->h_lockspace, __entry->h_nodeid, __entry->h_length,
show_header_cmd(__entry->h_cmd), show_header_cmd(__entry->h_cmd),
...@@ -394,22 +394,22 @@ DECLARE_EVENT_CLASS(dlm_rcom_template, ...@@ -394,22 +394,22 @@ DECLARE_EVENT_CLASS(dlm_rcom_template,
); );
DEFINE_EVENT(dlm_rcom_template, dlm_send_rcom, DEFINE_EVENT(dlm_rcom_template, dlm_send_rcom,
TP_PROTO(uint32_t seq, const struct dlm_rcom *rc), TP_PROTO(uint32_t h_seq, const struct dlm_rcom *rc),
TP_ARGS(seq, rc)); TP_ARGS(h_seq, rc));
DEFINE_EVENT(dlm_rcom_template, dlm_recv_rcom, DEFINE_EVENT(dlm_rcom_template, dlm_recv_rcom,
TP_PROTO(uint32_t seq, const struct dlm_rcom *rc), TP_PROTO(uint32_t h_seq, const struct dlm_rcom *rc),
TP_ARGS(seq, rc)); TP_ARGS(h_seq, rc));
TRACE_EVENT(dlm_send_message, TRACE_EVENT(dlm_send_message,
TP_PROTO(uint32_t seq, const struct dlm_message *ms, TP_PROTO(uint32_t h_seq, const struct dlm_message *ms,
const void *name, int namelen), const void *name, int namelen),
TP_ARGS(seq, ms, name, namelen), TP_ARGS(h_seq, ms, name, namelen),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(uint32_t, seq) __field(uint32_t, h_seq)
__field(uint32_t, h_version) __field(uint32_t, h_version)
__field(uint32_t, h_lockspace) __field(uint32_t, h_lockspace)
__field(uint32_t, h_nodeid) __field(uint32_t, h_nodeid)
...@@ -439,7 +439,7 @@ TRACE_EVENT(dlm_send_message, ...@@ -439,7 +439,7 @@ TRACE_EVENT(dlm_send_message,
), ),
TP_fast_assign( TP_fast_assign(
__entry->seq = seq; __entry->h_seq = h_seq;
__entry->h_version = le32_to_cpu(ms->m_header.h_version); __entry->h_version = le32_to_cpu(ms->m_header.h_version);
__entry->h_lockspace = le32_to_cpu(ms->m_header.u.h_lockspace); __entry->h_lockspace = le32_to_cpu(ms->m_header.u.h_lockspace);
__entry->h_nodeid = le32_to_cpu(ms->m_header.h_nodeid); __entry->h_nodeid = le32_to_cpu(ms->m_header.h_nodeid);
...@@ -469,14 +469,14 @@ TRACE_EVENT(dlm_send_message, ...@@ -469,14 +469,14 @@ TRACE_EVENT(dlm_send_message,
__get_dynamic_array_len(res_name)); __get_dynamic_array_len(res_name));
), ),
TP_printk("seq=%u h_version=%s h_lockspace=%u h_nodeid=%u " TP_printk("h_seq=%u h_version=%s h_lockspace=%u h_nodeid=%u "
"h_length=%u h_cmd=%s m_type=%s m_nodeid=%u " "h_length=%u h_cmd=%s m_type=%s m_nodeid=%u "
"m_pid=%u m_lkid=%u m_remid=%u m_parent_lkid=%u " "m_pid=%u m_lkid=%u m_remid=%u m_parent_lkid=%u "
"m_parent_remid=%u m_exflags=%s m_sbflags=%s m_flags=%s " "m_parent_remid=%u m_exflags=%s m_sbflags=%s m_flags=%s "
"m_lvbseq=%u m_hash=%u m_status=%d m_grmode=%s " "m_lvbseq=%u m_hash=%u m_status=%d m_grmode=%s "
"m_rqmode=%s m_bastmode=%s m_asts=%d m_result=%d " "m_rqmode=%s m_bastmode=%s m_asts=%d m_result=%d "
"m_extra=0x%s res_name=0x%s", "m_extra=0x%s res_name=0x%s",
__entry->seq, show_message_version(__entry->h_version), __entry->h_seq, show_message_version(__entry->h_version),
__entry->h_lockspace, __entry->h_nodeid, __entry->h_length, __entry->h_lockspace, __entry->h_nodeid, __entry->h_length,
show_header_cmd(__entry->h_cmd), show_header_cmd(__entry->h_cmd),
show_message_type(__entry->m_type), show_message_type(__entry->m_type),
...@@ -499,12 +499,12 @@ TRACE_EVENT(dlm_send_message, ...@@ -499,12 +499,12 @@ TRACE_EVENT(dlm_send_message,
TRACE_EVENT(dlm_recv_message, TRACE_EVENT(dlm_recv_message,
TP_PROTO(uint32_t seq, const struct dlm_message *ms), TP_PROTO(uint32_t h_seq, const struct dlm_message *ms),
TP_ARGS(seq, ms), TP_ARGS(h_seq, ms),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(uint32_t, seq) __field(uint32_t, h_seq)
__field(uint32_t, h_version) __field(uint32_t, h_version)
__field(uint32_t, h_lockspace) __field(uint32_t, h_lockspace)
__field(uint32_t, h_nodeid) __field(uint32_t, h_nodeid)
...@@ -533,7 +533,7 @@ TRACE_EVENT(dlm_recv_message, ...@@ -533,7 +533,7 @@ TRACE_EVENT(dlm_recv_message,
), ),
TP_fast_assign( TP_fast_assign(
__entry->seq = seq; __entry->h_seq = h_seq;
__entry->h_version = le32_to_cpu(ms->m_header.h_version); __entry->h_version = le32_to_cpu(ms->m_header.h_version);
__entry->h_lockspace = le32_to_cpu(ms->m_header.u.h_lockspace); __entry->h_lockspace = le32_to_cpu(ms->m_header.u.h_lockspace);
__entry->h_nodeid = le32_to_cpu(ms->m_header.h_nodeid); __entry->h_nodeid = le32_to_cpu(ms->m_header.h_nodeid);
...@@ -561,14 +561,14 @@ TRACE_EVENT(dlm_recv_message, ...@@ -561,14 +561,14 @@ TRACE_EVENT(dlm_recv_message,
__get_dynamic_array_len(m_extra)); __get_dynamic_array_len(m_extra));
), ),
TP_printk("seq=%u h_version=%s h_lockspace=%u h_nodeid=%u " TP_printk("h_seq=%u h_version=%s h_lockspace=%u h_nodeid=%u "
"h_length=%u h_cmd=%s m_type=%s m_nodeid=%u " "h_length=%u h_cmd=%s m_type=%s m_nodeid=%u "
"m_pid=%u m_lkid=%u m_remid=%u m_parent_lkid=%u " "m_pid=%u m_lkid=%u m_remid=%u m_parent_lkid=%u "
"m_parent_remid=%u m_exflags=%s m_sbflags=%s m_flags=%s " "m_parent_remid=%u m_exflags=%s m_sbflags=%s m_flags=%s "
"m_lvbseq=%u m_hash=%u m_status=%d m_grmode=%s " "m_lvbseq=%u m_hash=%u m_status=%d m_grmode=%s "
"m_rqmode=%s m_bastmode=%s m_asts=%d m_result=%d " "m_rqmode=%s m_bastmode=%s m_asts=%d m_result=%d "
"m_extra=0x%s", "m_extra=0x%s",
__entry->seq, show_message_version(__entry->h_version), __entry->h_seq, show_message_version(__entry->h_version),
__entry->h_lockspace, __entry->h_nodeid, __entry->h_length, __entry->h_lockspace, __entry->h_nodeid, __entry->h_length,
show_header_cmd(__entry->h_cmd), show_header_cmd(__entry->h_cmd),
show_message_type(__entry->m_type), show_message_type(__entry->m_type),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment