btrfs: prefix fsid to all trace events

When using trace events to debug a problem, it's impossible to determine
which file system generated a particular event.  This patch adds a
macro to prefix standard information to the head of a trace event.

The extent_state alloc/free events are all that's left without an
fs_info available.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 08e452599249..b6d210e7a993 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -606,7 +606,8 @@ add_delayed_ref_head(struct btrfs_fs_info *fs_info,
                 qrecord->num_bytes = num_bytes;
                 qrecord->old_roots = NULL;
 
-                qexisting = btrfs_qgroup_insert_dirty_extent(delayed_refs,
+                qexisting = btrfs_qgroup_insert_dirty_extent(fs_info,
+                                                             delayed_refs,
                                                              qrecord);
                 if (qexisting)
                         kfree(qrecord);
@@ -615,7 +616,7 @@ add_delayed_ref_head(struct btrfs_fs_info *fs_info,
         spin_lock_init(&head_ref->lock);
         mutex_init(&head_ref->mutex);
 
-        trace_add_delayed_ref_head(ref, head_ref, action);
+        trace_add_delayed_ref_head(fs_info, ref, head_ref, action);
 
         existing = htree_insert(&delayed_refs->href_root,
                                 &head_ref->href_node);
@@ -682,7 +683,7 @@ add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
                 ref->type = BTRFS_TREE_BLOCK_REF_KEY;
         full_ref->level = level;
 
-        trace_add_delayed_tree_ref(ref, full_ref, action);
+        trace_add_delayed_tree_ref(fs_info, ref, full_ref, action);
 
         ret = add_delayed_ref_tail_merge(trans, delayed_refs, head_ref, ref);
 
@@ -739,7 +740,7 @@ add_delayed_data_ref(struct btrfs_fs_info *fs_info,
         full_ref->objectid = owner;
         full_ref->offset = offset;
 
-        trace_add_delayed_data_ref(ref, full_ref, action);
+        trace_add_delayed_data_ref(fs_info, ref, full_ref, action);
 
         ret = add_delayed_ref_tail_merge(trans, delayed_refs, head_ref, ref);