queue-5.15/nfs-remove-unnecessary-trace_define_enum-s.patch

   1 From 22d8f1115cda79ca69d597de3cc3c49ed4787192 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Mon, 4 Oct 2021 10:09:57 -0400
   4 Subject: NFS: Remove unnecessary TRACE_DEFINE_ENUM()s
   5
   6 From: Chuck Lever <chuck.lever@oracle.com>
   7
   8 [ Upstream commit 8e09650f5ec68858f4b8b67cdef9e2ece9b208f3 ]
   9
  10 Clean up: TRACE_DEFINE_ENUM is unnecessary because the target
  11 symbols are all C macros, not enums.
  12
  13 Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
  14 Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
  15 Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
  16 ---
  17  fs/nfs/nfstrace.h | 68 -----------------------------------------------
  18  1 file changed, 68 deletions(-)
  19
  20 diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
  21 index 8a224871be74c..589f32fdbe637 100644
  22 --- a/fs/nfs/nfstrace.h
  23 +++ b/fs/nfs/nfstrace.h
  24 @@ -11,16 +11,6 @@
  25  #include <linux/tracepoint.h>
  26  #include <linux/iversion.h>
  27
  28 -TRACE_DEFINE_ENUM(DT_UNKNOWN);
  29 -TRACE_DEFINE_ENUM(DT_FIFO);
  30 -TRACE_DEFINE_ENUM(DT_CHR);
  31 -TRACE_DEFINE_ENUM(DT_DIR);
  32 -TRACE_DEFINE_ENUM(DT_BLK);
  33 -TRACE_DEFINE_ENUM(DT_REG);
  34 -TRACE_DEFINE_ENUM(DT_LNK);
  35 -TRACE_DEFINE_ENUM(DT_SOCK);
  36 -TRACE_DEFINE_ENUM(DT_WHT);
  37 -
  38  #define nfs_show_file_type(ftype) \
  39         __print_symbolic(ftype, \
  40                         { DT_UNKNOWN, "UNKNOWN" }, \
  41 @@ -33,24 +23,6 @@ TRACE_DEFINE_ENUM(DT_WHT);
  42                         { DT_SOCK, "SOCK" }, \
  43                         { DT_WHT, "WHT" })
  44
  45 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_DATA);
  46 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_ATIME);
  47 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_ACCESS);
  48 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_ACL);
  49 -TRACE_DEFINE_ENUM(NFS_INO_REVAL_PAGECACHE);
  50 -TRACE_DEFINE_ENUM(NFS_INO_REVAL_FORCED);
  51 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_LABEL);
  52 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_CHANGE);
  53 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_CTIME);
  54 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_MTIME);
  55 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_SIZE);
  56 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_OTHER);
  57 -TRACE_DEFINE_ENUM(NFS_INO_DATA_INVAL_DEFER);
  58 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_BLOCKS);
  59 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_XATTR);
  60 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_NLINK);
  61 -TRACE_DEFINE_ENUM(NFS_INO_INVALID_MODE);
  62 -
  63  #define nfs_show_cache_validity(v) \
  64         __print_flags(v, "|", \
  65                         { NFS_INO_INVALID_DATA, "INVALID_DATA" }, \
  66 @@ -71,17 +43,6 @@ TRACE_DEFINE_ENUM(NFS_INO_INVALID_MODE);
  67                         { NFS_INO_INVALID_NLINK, "INVALID_NLINK" }, \
  68                         { NFS_INO_INVALID_MODE, "INVALID_MODE" })
  69
  70 -TRACE_DEFINE_ENUM(NFS_INO_ADVISE_RDPLUS);
  71 -TRACE_DEFINE_ENUM(NFS_INO_STALE);
  72 -TRACE_DEFINE_ENUM(NFS_INO_ACL_LRU_SET);
  73 -TRACE_DEFINE_ENUM(NFS_INO_INVALIDATING);
  74 -TRACE_DEFINE_ENUM(NFS_INO_FSCACHE);
  75 -TRACE_DEFINE_ENUM(NFS_INO_FSCACHE_LOCK);
  76 -TRACE_DEFINE_ENUM(NFS_INO_LAYOUTCOMMIT);
  77 -TRACE_DEFINE_ENUM(NFS_INO_LAYOUTCOMMITTING);
  78 -TRACE_DEFINE_ENUM(NFS_INO_LAYOUTSTATS);
  79 -TRACE_DEFINE_ENUM(NFS_INO_ODIRECT);
  80 -
  81  #define nfs_show_nfsi_flags(v) \
  82         __print_flags(v, "|", \
  83                         { BIT(NFS_INO_ADVISE_RDPLUS), "ADVISE_RDPLUS" }, \
  84 @@ -270,19 +231,6 @@ TRACE_EVENT(nfs_access_exit,
  85                 )
  86  );
  87
  88 -TRACE_DEFINE_ENUM(LOOKUP_FOLLOW);
  89 -TRACE_DEFINE_ENUM(LOOKUP_DIRECTORY);
  90 -TRACE_DEFINE_ENUM(LOOKUP_AUTOMOUNT);
  91 -TRACE_DEFINE_ENUM(LOOKUP_PARENT);
  92 -TRACE_DEFINE_ENUM(LOOKUP_REVAL);
  93 -TRACE_DEFINE_ENUM(LOOKUP_RCU);
  94 -TRACE_DEFINE_ENUM(LOOKUP_OPEN);
  95 -TRACE_DEFINE_ENUM(LOOKUP_CREATE);
  96 -TRACE_DEFINE_ENUM(LOOKUP_EXCL);
  97 -TRACE_DEFINE_ENUM(LOOKUP_RENAME_TARGET);
  98 -TRACE_DEFINE_ENUM(LOOKUP_EMPTY);
  99 -TRACE_DEFINE_ENUM(LOOKUP_DOWN);
 100 -
 101  #define show_lookup_flags(flags) \
 102         __print_flags(flags, "|", \
 103                         { LOOKUP_FOLLOW, "FOLLOW" }, \
 104 @@ -392,22 +340,6 @@ DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_exit);
 105  DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_revalidate_enter);
 106  DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_revalidate_exit);
 107
 108 -TRACE_DEFINE_ENUM(O_WRONLY);
 109 -TRACE_DEFINE_ENUM(O_RDWR);
 110 -TRACE_DEFINE_ENUM(O_CREAT);
 111 -TRACE_DEFINE_ENUM(O_EXCL);
 112 -TRACE_DEFINE_ENUM(O_NOCTTY);
 113 -TRACE_DEFINE_ENUM(O_TRUNC);
 114 -TRACE_DEFINE_ENUM(O_APPEND);
 115 -TRACE_DEFINE_ENUM(O_NONBLOCK);
 116 -TRACE_DEFINE_ENUM(O_DSYNC);
 117 -TRACE_DEFINE_ENUM(O_DIRECT);
 118 -TRACE_DEFINE_ENUM(O_LARGEFILE);
 119 -TRACE_DEFINE_ENUM(O_DIRECTORY);
 120 -TRACE_DEFINE_ENUM(O_NOFOLLOW);
 121 -TRACE_DEFINE_ENUM(O_NOATIME);
 122 -TRACE_DEFINE_ENUM(O_CLOEXEC);
 123 -
 124  #define show_open_flags(flags) \
 125         __print_flags(flags, "|", \
 126                 { O_WRONLY, "O_WRONLY" }, \
 127 --
 128 2.43.0
 129