Merge tag 'powerpc-4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / fs / nfs / nfs4trace.h

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index cfb8f7c..845d0ea 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -241,38 +241,6 @@ DEFINE_NFS4_CLIENTID_EVENT(nfs4_bind_conn_to_session);
 DEFINE_NFS4_CLIENTID_EVENT(nfs4_sequence);
 DEFINE_NFS4_CLIENTID_EVENT(nfs4_reclaim_complete);
 
-TRACE_EVENT(nfs4_setup_sequence,
-               TP_PROTO(
-                       const struct nfs4_session *session,
-                       const struct nfs4_sequence_args *args
-               ),
-               TP_ARGS(session, args),
-
-               TP_STRUCT__entry(
-                       __field(unsigned int, session)
-                       __field(unsigned int, slot_nr)
-                       __field(unsigned int, seq_nr)
-                       __field(unsigned int, highest_used_slotid)
-               ),
-
-               TP_fast_assign(
-                       const struct nfs4_slot *sa_slot = args->sa_slot;
-                       __entry->session = nfs_session_id_hash(&session->sess_id);
-                       __entry->slot_nr = sa_slot->slot_nr;
-                       __entry->seq_nr = sa_slot->seq_nr;
-                       __entry->highest_used_slotid =
-                                       sa_slot->table->highest_used_slotid;
-               ),
-               TP_printk(
-                       "session=0x%08x slot_nr=%u seq_nr=%u "
-                       "highest_used_slotid=%u",
-                       __entry->session,
-                       __entry->slot_nr,
-                       __entry->seq_nr,
-                       __entry->highest_used_slotid
-               )
-);
-
 #define show_nfs4_sequence_status_flags(status) \
        __print_flags((unsigned long)status, "|", \
                { SEQ4_STATUS_CB_PATH_DOWN, "CB_PATH_DOWN" }, \
@@ -382,6 +350,38 @@ TRACE_EVENT(nfs4_cb_sequence,
 );
 #endif /* CONFIG_NFS_V4_1 */
 
+TRACE_EVENT(nfs4_setup_sequence,
+               TP_PROTO(
+                       const struct nfs4_session *session,
+                       const struct nfs4_sequence_args *args
+               ),
+               TP_ARGS(session, args),
+
+               TP_STRUCT__entry(
+                       __field(unsigned int, session)
+                       __field(unsigned int, slot_nr)
+                       __field(unsigned int, seq_nr)
+                       __field(unsigned int, highest_used_slotid)
+               ),
+
+               TP_fast_assign(
+                       const struct nfs4_slot *sa_slot = args->sa_slot;
+                       __entry->session = session ? nfs_session_id_hash(&session->sess_id) : 0;
+                       __entry->slot_nr = sa_slot->slot_nr;
+                       __entry->seq_nr = sa_slot->seq_nr;
+                       __entry->highest_used_slotid =
+                                       sa_slot->table->highest_used_slotid;
+               ),
+               TP_printk(
+                       "session=0x%08x slot_nr=%u seq_nr=%u "
+                       "highest_used_slotid=%u",
+                       __entry->session,
+                       __entry->slot_nr,
+                       __entry->seq_nr,
+                       __entry->highest_used_slotid
+               )
+);
+
 DECLARE_EVENT_CLASS(nfs4_open_event,
                TP_PROTO(
                        const struct nfs_open_context *ctx,