diff options
| author | Chris Mason <clm@fb.com> | 2015-12-18 11:11:10 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-12-18 11:11:10 -0800 |
| commit | f7d3d2f99eeaa9f5c111965b1516972f4fc5e449 (patch) | |
| tree | 2ad3d4d98af789fd807795a9683ce4904b3c4182 /include/trace | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
| parent | 70f6d82ec73c3ae2d3adc6853c5bebcd73610097 (diff) | |
| download | linux-f7d3d2f99eeaa9f5c111965b1516972f4fc5e449.tar.gz linux-f7d3d2f99eeaa9f5c111965b1516972f4fc5e449.tar.bz2 linux-f7d3d2f99eeaa9f5c111965b1516972f4fc5e449.zip | |
Merge branch 'freespace-tree' into for-linus-4.5
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'include/trace')
| -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) \ |