New upstream version 0.7.2

[mirror_zfs-debian.git] / include / sys / trace_acl.h

diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h
index 2308942294e0bcafa35f9ec9c48928e343d69b4d..1057e560ba6c582041a8f1d2c283a3bac4fba8b9 100644 (file)
--- a/include/sys/trace_acl.h
+++ b/include/sys/trace_acl.h
@@ -31,6 +31,7 @@
 #define        _TRACE_ACL_H
 
 #include <linux/tracepoint.h>
+#include <linux/vfs_compat.h>
 #include <sys/types.h>
 
 /*
@@ -41,7 +42,7 @@
  *     zfs_ace_hdr_t *, ...,
  *     uint32_t, ...);
  */
-
+/* BEGIN CSTYLED */
 DECLARE_EVENT_CLASS(zfs_ace_class,
        TP_PROTO(znode_t *zn, zfs_ace_hdr_t *ace, uint32_t mask_matched),
        TP_ARGS(zn, ace, mask_matched),
@@ -54,12 +55,8 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
            __field(uint_t,             z_blksz)
            __field(uint_t,             z_seq)
            __field(uint64_t,           z_mapcnt)
-           __field(uint64_t,           z_gen)
            __field(uint64_t,           z_size)
-           __field(uint64_t,           z_links)
            __field(uint64_t,           z_pflags)
-           __field(uint64_t,           z_uid)
-           __field(uint64_t,           z_gid)
            __field(uint32_t,           z_sync_cnt)
            __field(mode_t,             z_mode)
            __field(boolean_t,          z_is_sa)
@@ -67,6 +64,8 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
            __field(boolean_t,          z_is_ctldir)
            __field(boolean_t,          z_is_stale)
 
+           __field(uint32_t,           i_uid)
+           __field(uint32_t,           i_gid)
            __field(unsigned long,      i_ino)
            __field(unsigned int,       i_nlink)
            __field(u64,                i_version)
@@ -91,12 +90,8 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
            __entry->z_blksz            = zn->z_blksz;
            __entry->z_seq              = zn->z_seq;
            __entry->z_mapcnt           = zn->z_mapcnt;
-           __entry->z_gen              = zn->z_gen;
            __entry->z_size             = zn->z_size;
-           __entry->z_links            = zn->z_links;
            __entry->z_pflags           = zn->z_pflags;
-           __entry->z_uid              = zn->z_uid;
-           __entry->z_gid              = zn->z_gid;
            __entry->z_sync_cnt         = zn->z_sync_cnt;
            __entry->z_mode             = zn->z_mode;
            __entry->z_is_sa            = zn->z_is_sa;
@@ -104,6 +99,8 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
            __entry->z_is_ctldir        = zn->z_is_ctldir;
            __entry->z_is_stale         = zn->z_is_stale;
 
+           __entry->i_uid              = KUID_TO_SUID(ZTOI(zn)->i_uid);
+           __entry->i_gid              = KGID_TO_SGID(ZTOI(zn)->i_gid);
            __entry->i_ino              = zn->z_inode.i_ino;
            __entry->i_nlink            = zn->z_inode.i_nlink;
            __entry->i_version          = zn->z_inode.i_version;
@@ -121,31 +118,32 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
        ),
        TP_printk("zn { id %llu unlinked %u atime_dirty %u "
            "zn_prefetch %u moved %u blksz %u seq %u "
-           "mapcnt %llu gen %llu size %llu "
-           "links %llu pflags %llu uid %llu gid %llu "
+           "mapcnt %llu size %llu pflags %llu "
            "sync_cnt %u mode 0x%x is_sa %d "
            "is_mapped %d is_ctldir %d is_stale %d inode { "
-           "ino %lu nlink %u version %llu size %lli blkbits %u "
-           "bytes %u mode 0x%x generation %x } } ace { type %u "
-           "flags %u access_mask %u } mask_matched %u",
+           "uid %u gid %u ino %lu nlink %u version %llu size %lli "
+           "blkbits %u bytes %u mode 0x%x generation %x } } "
+           "ace { type %u flags %u access_mask %u } mask_matched %u",
            __entry->z_id, __entry->z_unlinked, __entry->z_atime_dirty,
            __entry->z_zn_prefetch, __entry->z_moved, __entry->z_blksz,
-           __entry->z_seq, __entry->z_mapcnt, __entry->z_gen,
-           __entry->z_size,
-           __entry->z_links, __entry->z_pflags, __entry->z_uid,
-           __entry->z_gid, __entry->z_sync_cnt, __entry->z_mode,
+           __entry->z_seq, __entry->z_mapcnt, __entry->z_size,
+           __entry->z_pflags, __entry->z_sync_cnt, __entry->z_mode,
            __entry->z_is_sa, __entry->z_is_mapped,
-           __entry->z_is_ctldir, __entry->z_is_stale, __entry->i_ino,
-           __entry->i_nlink, __entry->i_version, __entry->i_size,
-           __entry->i_blkbits, __entry->i_bytes, __entry->i_mode,
-           __entry->i_generation, __entry->z_type, __entry->z_flags,
-           __entry->z_access_mask, __entry->mask_matched)
+           __entry->z_is_ctldir, __entry->z_is_stale, __entry->i_uid,
+           __entry->i_gid, __entry->i_ino, __entry->i_nlink,
+           __entry->i_version, __entry->i_size, __entry->i_blkbits,
+           __entry->i_bytes, __entry->i_mode, __entry->i_generation,
+           __entry->z_type, __entry->z_flags, __entry->z_access_mask,
+           __entry->mask_matched)
 );
+/* END CSTYLED */
 
+/* BEGIN CSTYLED */
 #define        DEFINE_ACE_EVENT(name) \
 DEFINE_EVENT(zfs_ace_class, name, \
        TP_PROTO(znode_t *zn, zfs_ace_hdr_t *ace, uint32_t mask_matched), \
        TP_ARGS(zn, ace, mask_matched))
+/* END CSTYLED */
 DEFINE_ACE_EVENT(zfs_zfs__ace__denies);
 DEFINE_ACE_EVENT(zfs_zfs__ace__allows);