Changes since v1: - Rebased on Trond's current "testing" branch - Shortened show_fs_fmode macro to prevent pre-processor overflow Note that these changed patches compile, but haven't otherwise been tested again. --- Chuck Lever (2): NFS: Move generic FS show macros to global header NFS: Move NFS protocol display macros to global header fs/nfs/nfs4trace.h | 468 +++++-------------------------------- fs/nfs/nfstrace.h | 197 +++------------- fs/nfs/pnfs.h | 4 - fs/nfsd/trace.h | 1 + include/linux/nfs4.h | 4 + include/trace/events/fs.h | 122 ++++++++++ include/trace/events/nfs.h | 375 +++++++++++++++++++++++++++++ 7 files changed, 588 insertions(+), 583 deletions(-) create mode 100644 include/trace/events/fs.h create mode 100644 include/trace/events/nfs.h -- Chuck Lever