diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-20 14:35:31 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-20 14:35:31 -0300 |
commit | cd07e536b0201fceffd90a701bfb1e1fc07fcd34 (patch) | |
tree | 4777d4b2f749b279fc07bd41f11b88c9e4578afe /fs/btrfs/print-tree.h | |
parent | 47fddcb479e73c341fb414e40a89572dacadd360 (diff) | |
parent | 45dfb8a5659ad286c28fa59008271dbc4e5e3f2d (diff) | |
download | linux-cd07e536b0201fceffd90a701bfb1e1fc07fcd34.tar.bz2 |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'fs/btrfs/print-tree.h')
-rw-r--r-- | fs/btrfs/print-tree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/print-tree.h b/fs/btrfs/print-tree.h index 78b99385a503..8c3e9319ec4e 100644 --- a/fs/btrfs/print-tree.h +++ b/fs/btrfs/print-tree.h @@ -11,6 +11,6 @@ void btrfs_print_leaf(struct extent_buffer *l); void btrfs_print_tree(struct extent_buffer *c, bool follow); -const char *btrfs_root_name(u64 objectid, char *buf); +const char *btrfs_root_name(const struct btrfs_key *key, char *buf); #endif |