diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-26 03:19:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-26 03:19:13 -0400 |
| commit | 413d63d71b222108d19703f3fd5cf9108652a730 (patch) | |
| tree | 4680de6aebb6430dc5f3d9327f86d65149e6b5ae /fs/btrfs/tree-log.c | |
| parent | d6c8103b0265d8db30e20e948a4f06382bbdaea7 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts
Conflicts:
arch/x86/kernel/head64.c
arch/x86/mm/mmap.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index f20ef211a73d..3a11ae63676e 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -2153,8 +2153,7 @@ process_leaf: | |||
| 2153 | u32 this_len = sizeof(*di) + name_len + data_len; | 2153 | u32 this_len = sizeof(*di) + name_len + data_len; |
| 2154 | char *name; | 2154 | char *name; |
| 2155 | 2155 | ||
| 2156 | ret = verify_dir_item(fs_info, path->nodes[0], | 2156 | ret = verify_dir_item(fs_info, path->nodes[0], i, di); |
| 2157 | path->slots[0], di); | ||
| 2158 | if (ret) { | 2157 | if (ret) { |
| 2159 | ret = -EIO; | 2158 | ret = -EIO; |
| 2160 | goto out; | 2159 | goto out; |