diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
| commit | 08fb98f5bf95cef902fc30427b39617a6f6875c7 (patch) | |
| tree | d709cdc500b447bb957fd1e7fbc9073005b8ce8e /fs/btrfs/check-integrity.c | |
| parent | 99aa22d0d8f70d9317727ab40c85b2ead740a6ca (diff) | |
| parent | a017f583ec87d40b06eee6a6beeabe879c8113dd (diff) | |
Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/check-integrity.c')
| -rw-r--r-- | fs/btrfs/check-integrity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index b677a6ea6001..7706c8dc5fa6 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -2645,7 +2645,7 @@ static void btrfsic_dump_tree_sub(const struct btrfsic_state *state, * This algorithm is recursive because the amount of used stack space * is very small and the max recursion depth is limited. */ - indent_add = sprintf(buf, "%c-%llu(%s/%llu/%d)", + indent_add = sprintf(buf, "%c-%llu(%s/%llu/%u)", btrfsic_get_block_type(state, block), block->logical_bytenr, block->dev_state->name, block->dev_bytenr, block->mirror_num); |