diff options
-rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
-rw-r--r-- | include/trace/events/btrfs.h | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index a713d9d324b0..fab189c67eff 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -7059,7 +7059,7 @@ insert: | |||
7059 | write_unlock(&em_tree->lock); | 7059 | write_unlock(&em_tree->lock); |
7060 | out: | 7060 | out: |
7061 | 7061 | ||
7062 | trace_btrfs_get_extent(root, em); | 7062 | trace_btrfs_get_extent(root, inode, em); |
7063 | 7063 | ||
7064 | btrfs_free_path(path); | 7064 | btrfs_free_path(path); |
7065 | if (trans) { | 7065 | if (trans) { |
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h index b09225c77676..3048f5205363 100644 --- a/include/trace/events/btrfs.h +++ b/include/trace/events/btrfs.h | |||
@@ -184,14 +184,16 @@ DEFINE_EVENT(btrfs__inode, btrfs_inode_evict, | |||
184 | 184 | ||
185 | TRACE_EVENT_CONDITION(btrfs_get_extent, | 185 | TRACE_EVENT_CONDITION(btrfs_get_extent, |
186 | 186 | ||
187 | TP_PROTO(struct btrfs_root *root, struct extent_map *map), | 187 | TP_PROTO(struct btrfs_root *root, struct inode *inode, |
188 | struct extent_map *map), | ||
188 | 189 | ||
189 | TP_ARGS(root, map), | 190 | TP_ARGS(root, inode, map), |
190 | 191 | ||
191 | TP_CONDITION(map), | 192 | TP_CONDITION(map), |
192 | 193 | ||
193 | TP_STRUCT__entry_btrfs( | 194 | TP_STRUCT__entry_btrfs( |
194 | __field( u64, root_objectid ) | 195 | __field( u64, root_objectid ) |
196 | __field( u64, ino ) | ||
195 | __field( u64, start ) | 197 | __field( u64, start ) |
196 | __field( u64, len ) | 198 | __field( u64, len ) |
197 | __field( u64, orig_start ) | 199 | __field( u64, orig_start ) |
@@ -204,7 +206,8 @@ TRACE_EVENT_CONDITION(btrfs_get_extent, | |||
204 | 206 | ||
205 | TP_fast_assign_btrfs(root->fs_info, | 207 | TP_fast_assign_btrfs(root->fs_info, |
206 | __entry->root_objectid = root->root_key.objectid; | 208 | __entry->root_objectid = root->root_key.objectid; |
207 | __entry->start = map->start; | 209 | __entry->ino = btrfs_ino(inode); |
210 | __entry->start = map->start; | ||
208 | __entry->len = map->len; | 211 | __entry->len = map->len; |
209 | __entry->orig_start = map->orig_start; | 212 | __entry->orig_start = map->orig_start; |
210 | __entry->block_start = map->block_start; | 213 | __entry->block_start = map->block_start; |
@@ -214,11 +217,12 @@ TRACE_EVENT_CONDITION(btrfs_get_extent, | |||
214 | __entry->compress_type = map->compress_type; | 217 | __entry->compress_type = map->compress_type; |
215 | ), | 218 | ), |
216 | 219 | ||
217 | TP_printk_btrfs("root = %llu(%s), start = %llu, len = %llu, " | 220 | TP_printk_btrfs("root = %llu(%s), ino = %llu start = %llu, len = %llu, " |
218 | "orig_start = %llu, block_start = %llu(%s), " | 221 | "orig_start = %llu, block_start = %llu(%s), " |
219 | "block_len = %llu, flags = %s, refs = %u, " | 222 | "block_len = %llu, flags = %s, refs = %u, " |
220 | "compress_type = %u", | 223 | "compress_type = %u", |
221 | show_root_type(__entry->root_objectid), | 224 | show_root_type(__entry->root_objectid), |
225 | (unsigned long long)__entry->ino, | ||
222 | (unsigned long long)__entry->start, | 226 | (unsigned long long)__entry->start, |
223 | (unsigned long long)__entry->len, | 227 | (unsigned long long)__entry->len, |
224 | (unsigned long long)__entry->orig_start, | 228 | (unsigned long long)__entry->orig_start, |