reiserfs: remove workaround code for GCC 3.x

[linux-2.6-block.git] / fs / cifs / trace.h

diff --git a/fs/cifs/trace.h b/fs/cifs/trace.h
index d4aed5217a561d6a0ecb406e8d3e72155a0e40f3..cce8414fe7ec2b5e3af9c0660c6db033828cb86f 100644 (file)
--- a/fs/cifs/trace.h
+++ b/fs/cifs/trace.h
@@ -460,6 +460,85 @@ DEFINE_EVENT(smb3_open_done_class, smb3_##name,  \
 DEFINE_SMB3_OPEN_DONE_EVENT(open_done);
 DEFINE_SMB3_OPEN_DONE_EVENT(posix_mkdir_done);
 
+
+DECLARE_EVENT_CLASS(smb3_lease_done_class,
+       TP_PROTO(__u32  lease_state,
+               __u32   tid,
+               __u64   sesid,
+               __u64   lease_key_low,
+               __u64   lease_key_high),
+       TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high),
+       TP_STRUCT__entry(
+               __field(__u32, lease_state)
+               __field(__u32, tid)
+               __field(__u64, sesid)
+               __field(__u64, lease_key_low)
+               __field(__u64, lease_key_high)
+       ),
+       TP_fast_assign(
+               __entry->lease_state = lease_state;
+               __entry->tid = tid;
+               __entry->sesid = sesid;
+               __entry->lease_key_low = lease_key_low;
+               __entry->lease_key_high = lease_key_high;
+       ),
+       TP_printk("sid=0x%llx tid=0x%x lease_key=0x%llx%llx lease_state=0x%x",
+               __entry->sesid, __entry->tid, __entry->lease_key_high,
+               __entry->lease_key_low, __entry->lease_state)
+)
+
+#define DEFINE_SMB3_LEASE_DONE_EVENT(name)        \
+DEFINE_EVENT(smb3_lease_done_class, smb3_##name,  \
+       TP_PROTO(__u32  lease_state,            \
+               __u32   tid,                    \
+               __u64   sesid,                  \
+               __u64   lease_key_low,          \
+               __u64   lease_key_high),        \
+       TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high))
+
+DEFINE_SMB3_LEASE_DONE_EVENT(lease_done);
+
+DECLARE_EVENT_CLASS(smb3_lease_err_class,
+       TP_PROTO(__u32  lease_state,
+               __u32   tid,
+               __u64   sesid,
+               __u64   lease_key_low,
+               __u64   lease_key_high,
+               int     rc),
+       TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high, rc),
+       TP_STRUCT__entry(
+               __field(__u32, lease_state)
+               __field(__u32, tid)
+               __field(__u64, sesid)
+               __field(__u64, lease_key_low)
+               __field(__u64, lease_key_high)
+               __field(int, rc)
+       ),
+       TP_fast_assign(
+               __entry->lease_state = lease_state;
+               __entry->tid = tid;
+               __entry->sesid = sesid;
+               __entry->lease_key_low = lease_key_low;
+               __entry->lease_key_high = lease_key_high;
+               __entry->rc = rc;
+       ),
+       TP_printk("sid=0x%llx tid=0x%x lease_key=0x%llx%llx lease_state=0x%x rc=%d",
+               __entry->sesid, __entry->tid, __entry->lease_key_high,
+               __entry->lease_key_low, __entry->lease_state, __entry->rc)
+)
+
+#define DEFINE_SMB3_LEASE_ERR_EVENT(name)        \
+DEFINE_EVENT(smb3_lease_err_class, smb3_##name,  \
+       TP_PROTO(__u32  lease_state,            \
+               __u32   tid,                    \
+               __u64   sesid,                  \
+               __u64   lease_key_low,          \
+               __u64   lease_key_high,         \
+               int     rc),                    \
+       TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high, rc))
+
+DEFINE_SMB3_LEASE_ERR_EVENT(lease_err);
+
 DECLARE_EVENT_CLASS(smb3_reconnect_class,
        TP_PROTO(__u64  currmid,
                char *hostname),
@@ -486,6 +565,36 @@ DEFINE_EVENT(smb3_reconnect_class, smb3_##name,  \
 DEFINE_SMB3_RECONNECT_EVENT(reconnect);
 DEFINE_SMB3_RECONNECT_EVENT(partial_send_reconnect);
 
+DECLARE_EVENT_CLASS(smb3_credit_class,
+       TP_PROTO(__u64  currmid,
+               char *hostname,
+               int credits),
+       TP_ARGS(currmid, hostname, credits),
+       TP_STRUCT__entry(
+               __field(__u64, currmid)
+               __field(char *, hostname)
+               __field(int, credits)
+       ),
+       TP_fast_assign(
+               __entry->currmid = currmid;
+               __entry->hostname = hostname;
+               __entry->credits = credits;
+       ),
+       TP_printk("server=%s current_mid=0x%llx credits=%d",
+               __entry->hostname,
+               __entry->currmid,
+               __entry->credits)
+)
+
+#define DEFINE_SMB3_CREDIT_EVENT(name)        \
+DEFINE_EVENT(smb3_credit_class, smb3_##name,  \
+       TP_PROTO(__u64  currmid,                \
+               char *hostname,                 \
+               int  credits),                  \
+       TP_ARGS(currmid, hostname, credits))
+
+DEFINE_SMB3_CREDIT_EVENT(reconnect_with_invalid_credits);
+
 #endif /* _CIFS_TRACE_H */
 
 #undef TRACE_INCLUDE_PATH