diff options
| author | Chris Mason <clm@fb.com> | 2015-12-23 22:29:09 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-12-23 22:29:09 +0100 |
| commit | f0f76413d332d74446d0ee9535a29a900c4f63e4 (patch) | |
| tree | 01d631840c1b9bcdaff4977e10614b011079506f /include | |
| parent | Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge branch 'freespace-tree' into for-linus-4.5 (diff) | |
| download | linux-f0f76413d332d74446d0ee9535a29a900c4f63e4.tar.xz linux-f0f76413d332d74446d0ee9535a29a900c4f63e4.zip | |
Merge branch 'freespace-4.5' into for-linus-4.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/btrfs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h index b4473dab39d6..d866f21efbbf 100644 --- a/include/trace/events/btrfs.h +++ b/include/trace/events/btrfs.h @@ -45,7 +45,8 @@ struct btrfs_qgroup_operation; { BTRFS_TREE_LOG_OBJECTID, "TREE_LOG" }, \ { BTRFS_QUOTA_TREE_OBJECTID, "QUOTA_TREE" }, \ { BTRFS_TREE_RELOC_OBJECTID, "TREE_RELOC" }, \ - { BTRFS_UUID_TREE_OBJECTID, "UUID_RELOC" }, \ + { BTRFS_UUID_TREE_OBJECTID, "UUID_TREE" }, \ + { BTRFS_FREE_SPACE_TREE_OBJECTID, "FREE_SPACE_TREE" }, \ { BTRFS_DATA_RELOC_TREE_OBJECTID, "DATA_RELOC_TREE" }) #define show_root_type(obj) \ |