Re: linux-next: build failure after merge of the mm tree
From: Matthew Wilcox <willy@infradead.org>
Date: 2023-08-22 20:20:22
Also in:
linux-next, linux-xfs, lkml
Subsystem:
filesystems (vfs and infrastructure), the rest, xfs filesystem · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds, Carlos Maiolino
Possibly related (same subject, not in this thread)
- 2023-12-01 · Re: linux-next: build failure after merge of the mm tree · Michael Ellerman <mpe@ellerman.id.au>
- 2023-11-30 · Re: linux-next: build failure after merge of the mm tree · Andrew Morton <akpm@linux-foundation.org>
- 2023-11-30 · Re: linux-next: build failure after merge of the mm tree · Michael Ellerman <mpe@ellerman.id.au>
- 2023-11-30 · Re: linux-next: build failure after merge of the mm tree · Andrew Morton <akpm@linux-foundation.org>
- 2023-11-30 · Re: linux-next: build failure after merge of the mm tree · Stephen Rothwell <hidden>
On Mon, Aug 21, 2023 at 09:00:43PM -0700, Darrick J. Wong wrote:
Please leave this ^^^ comment, because the need for TRACE_DEFINE_ENUM to make enums work in tracepoints is not at all obvious. "order %u" to match the (non dev_t) style of the rest of the xfs tracepoints.
ACK, thanks. Andrew, please add this -fix patch for "mm: Remove enum page_entry_size".
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 1904eaf7a2e9..fd789e00dfd6 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h@@ -802,9 +802,6 @@ DEFINE_INODE_EVENT(xfs_inode_inactivating); * ring buffer. Somehow this was only worth mentioning in the ftrace sample * code. */ -TRACE_DEFINE_ENUM(PMD_ORDER); -TRACE_DEFINE_ENUM(PUD_ORDER); - TRACE_DEFINE_ENUM(XFS_REFC_DOMAIN_SHARED); TRACE_DEFINE_ENUM(XFS_REFC_DOMAIN_COW);
@@ -823,13 +820,10 @@ TRACE_EVENT(xfs_filemap_fault, __entry->order = order; __entry->write_fault = write_fault; ), - TP_printk("dev %d:%d ino 0x%llx %s write_fault %d", + TP_printk("dev %d:%d ino 0x%llx order %u write_fault %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, - __print_symbolic(__entry->order, - { 0, "PTE" }, - { PMD_ORDER, "PMD" }, - { PUD_ORDER, "PUD" }), + __entry->order, __entry->write_fault) )