diff options
author | Dave Chinner <david@fromorbit.com> | 2015-04-16 22:13:18 +1000 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-04-16 22:13:18 +1000 |
commit | 542c311813d5cb2e6f0dfa9557f41c829b8fb6a0 (patch) | |
tree | 573c5644eb966e44112016c9ae86e80251326223 /fs/xfs/xfs_trace.h | |
parent | 6a63ef064b2444883ce8b68b0779d0c739d27204 (diff) | |
parent | 0cefb29e6a63727bc7606c47fc538467594ef112 (diff) | |
download | linux-stable-542c311813d5cb2e6f0dfa9557f41c829b8fb6a0.tar.gz linux-stable-542c311813d5cb2e6f0dfa9557f41c829b8fb6a0.tar.bz2 linux-stable-542c311813d5cb2e6f0dfa9557f41c829b8fb6a0.zip |
Merge branch 'xfs-dio-extend-fix' into for-next
Conflicts:
fs/xfs/xfs_file.c
Diffstat (limited to 'fs/xfs/xfs_trace.h')
-rw-r--r-- | fs/xfs/xfs_trace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index b2a45cc9eceb..615781bf4ee5 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -1221,6 +1221,11 @@ DEFINE_IOMAP_EVENT(xfs_map_blocks_found); DEFINE_IOMAP_EVENT(xfs_map_blocks_alloc); DEFINE_IOMAP_EVENT(xfs_get_blocks_found); DEFINE_IOMAP_EVENT(xfs_get_blocks_alloc); +DEFINE_IOMAP_EVENT(xfs_gbmap_direct); +DEFINE_IOMAP_EVENT(xfs_gbmap_direct_new); +DEFINE_IOMAP_EVENT(xfs_gbmap_direct_update); +DEFINE_IOMAP_EVENT(xfs_gbmap_direct_none); +DEFINE_IOMAP_EVENT(xfs_gbmap_direct_endio); DECLARE_EVENT_CLASS(xfs_simple_io_class, TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count), |