netfs: Generate enums from trace symbol mapping lists

netfs has a number of lists of symbols for use in tracing, listed in an
enum and then listed again in a symbol->string mapping for use with
__print_symbolic().  This is, however, redundant.

Instead, use the symbol->string mapping list to also generate the enum
where the enum is in the same file.

Changes
=======
ver #3)
 - #undef EM and E_ at the end of the trace file[1].

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
cc: linux-cachefs@redhat.com

Link: https://lore.kernel.org/r/c2f4b3dc107b106e04c48f54945a12715cccfdf3.camel@redhat.com/
Link: https://lore.kernel.org/r/164622980839.3564931.5673300162465266909.stgit@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/164678192454.1200972.4428834328108580460.stgit@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/CALF+zOkB38_MB5QwNUtqTU4WjMaLUJ5+Piwsn3pMxkO3d4J7Kg@mail.gmail.com/
Link: https://lore.kernel.org/r/164692890614.2099075.12960653141802151575.stgit@warthog.procyon.org.uk/

diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h
index e6f4ebbb4c69e52f4fc97797a272b198772d2c6a..4d0bf02d490a7cfceb4168c137487ac7dcfd2477 100644 (file)
--- a/include/trace/events/netfs.h
+++ b/include/trace/events/netfs.h
@@ -15,49 +15,6 @@
 /*
  * Define enums for tracing information.
  */
-#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
-#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
-
-enum netfs_read_trace {
-       netfs_read_trace_expanded,
-       netfs_read_trace_readahead,
-       netfs_read_trace_readpage,
-       netfs_read_trace_write_begin,
-};
-
-enum netfs_rreq_trace {
-       netfs_rreq_trace_assess,
-       netfs_rreq_trace_done,
-       netfs_rreq_trace_free,
-       netfs_rreq_trace_resubmit,
-       netfs_rreq_trace_unlock,
-       netfs_rreq_trace_unmark,
-       netfs_rreq_trace_write,
-};
-
-enum netfs_sreq_trace {
-       netfs_sreq_trace_download_instead,
-       netfs_sreq_trace_free,
-       netfs_sreq_trace_prepare,
-       netfs_sreq_trace_resubmit_short,
-       netfs_sreq_trace_submit,
-       netfs_sreq_trace_terminated,
-       netfs_sreq_trace_write,
-       netfs_sreq_trace_write_skip,
-       netfs_sreq_trace_write_term,
-};
-
-enum netfs_failure {
-       netfs_fail_check_write_begin,
-       netfs_fail_copy_to_cache,
-       netfs_fail_read,
-       netfs_fail_short_readpage,
-       netfs_fail_short_write_begin,
-       netfs_fail_prepare_write,
-};
-
-#endif
-
 #define netfs_read_traces                                      \
        EM(netfs_read_trace_expanded,           "EXPANDED ")    \
        EM(netfs_read_trace_readahead,          "READAHEAD")    \
@@ -98,6 +55,20 @@ enum netfs_failure {
        EM(netfs_fail_short_write_begin,        "short-write-begin")    \
        E_(netfs_fail_prepare_write,            "prep-write")
 
+#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
+#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
+
+#undef EM
+#undef E_
+#define EM(a, b) a,
+#define E_(a, b) a
+
+enum netfs_read_trace { netfs_read_traces } __mode(byte);
+enum netfs_rreq_trace { netfs_rreq_traces } __mode(byte);
+enum netfs_sreq_trace { netfs_sreq_traces } __mode(byte);
+enum netfs_failure { netfs_failures } __mode(byte);
+
+#endif
 
 /*
  * Export enum symbols via userspace.
@@ -258,6 +229,8 @@ TRACE_EVENT(netfs_failure,
                      __entry->error)
            );
 
+#undef EM
+#undef E_
 #endif /* _TRACE_NETFS_H */
 
 /* This part must be outside protection */