xfs: remove trivial eof/cowblocks functions

[linux-2.6-microblaze.git] / fs / xfs / xfs_trace.h

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 8695165..404a00e 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -37,6 +37,7 @@ struct xfs_trans_res;
 struct xfs_inobt_rec_incore;
 union xfs_btree_ptr;
 struct xfs_dqtrx;
+struct xfs_eofblocks;
 
 #define XFS_ATTR_FILTER_FLAGS \
        { XFS_ATTR_ROOT,        "ROOT" }, \
@@ -103,6 +104,24 @@ DEFINE_ATTR_LIST_EVENT(xfs_attr_list_notfound);
 DEFINE_ATTR_LIST_EVENT(xfs_attr_leaf_list);
 DEFINE_ATTR_LIST_EVENT(xfs_attr_node_list);
 
+TRACE_EVENT(xlog_intent_recovery_failed,
+       TP_PROTO(struct xfs_mount *mp, int error, void *function),
+       TP_ARGS(mp, error, function),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(int, error)
+               __field(void *, function)
+       ),
+       TP_fast_assign(
+               __entry->dev = mp->m_super->s_dev;
+               __entry->error = error;
+               __entry->function = function;
+       ),
+       TP_printk("dev %d:%d error %d function %pS",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->error, __entry->function)
+);
+
 DECLARE_EVENT_CLASS(xfs_perag_class,
        TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int refcount,
                 unsigned long caller_ip),
@@ -340,7 +359,7 @@ DEFINE_BUF_EVENT(xfs_buf_get_uncached);
 DEFINE_BUF_EVENT(xfs_buf_item_relse);
 DEFINE_BUF_EVENT(xfs_buf_iodone_async);
 DEFINE_BUF_EVENT(xfs_buf_error_relse);
-DEFINE_BUF_EVENT(xfs_buf_wait_buftarg);
+DEFINE_BUF_EVENT(xfs_buf_drain_buftarg);
 DEFINE_BUF_EVENT(xfs_trans_read_buf_shut);
 
 /* not really buffer traces, but the buf provides useful information */
@@ -3870,6 +3889,47 @@ DEFINE_EVENT(xfs_timestamp_range_class, name, \
 DEFINE_TIMESTAMP_RANGE_EVENT(xfs_inode_timestamp_range);
 DEFINE_TIMESTAMP_RANGE_EVENT(xfs_quota_expiry_range);
 
+DECLARE_EVENT_CLASS(xfs_eofblocks_class,
+       TP_PROTO(struct xfs_mount *mp, struct xfs_eofblocks *eofb,
+                unsigned long caller_ip),
+       TP_ARGS(mp, eofb, caller_ip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(__u32, flags)
+               __field(uint32_t, uid)
+               __field(uint32_t, gid)
+               __field(prid_t, prid)
+               __field(__u64, min_file_size)
+               __field(unsigned long, caller_ip)
+       ),
+       TP_fast_assign(
+               __entry->dev = mp->m_super->s_dev;
+               __entry->flags = eofb ? eofb->eof_flags : 0;
+               __entry->uid = eofb ? from_kuid(mp->m_super->s_user_ns,
+                                               eofb->eof_uid) : 0;
+               __entry->gid = eofb ? from_kgid(mp->m_super->s_user_ns,
+                                               eofb->eof_gid) : 0;
+               __entry->prid = eofb ? eofb->eof_prid : 0;
+               __entry->min_file_size = eofb ? eofb->eof_min_file_size : 0;
+               __entry->caller_ip = caller_ip;
+       ),
+       TP_printk("dev %d:%d flags 0x%x uid %u gid %u prid %u minsize %llu caller %pS",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->flags,
+                 __entry->uid,
+                 __entry->gid,
+                 __entry->prid,
+                 __entry->min_file_size,
+                 (char *)__entry->caller_ip)
+);
+#define DEFINE_EOFBLOCKS_EVENT(name)   \
+DEFINE_EVENT(xfs_eofblocks_class, name,        \
+       TP_PROTO(struct xfs_mount *mp, struct xfs_eofblocks *eofb, \
+                unsigned long caller_ip), \
+       TP_ARGS(mp, eofb, caller_ip))
+DEFINE_EOFBLOCKS_EVENT(xfs_ioc_free_eofblocks);
+DEFINE_EOFBLOCKS_EVENT(xfs_blockgc_free_space);
+
 #endif /* _TRACE_XFS_H */
 
 #undef TRACE_INCLUDE_PATH