diff options
| author |   Liu Bo <bo.liu@linux.alibaba.com> | 2018-04-03 01:59:48 +0800 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2018-04-05 19:22:26 +0200 |
| commit | b98def7ca6e152ee55e36863dddf6f41f12d1dc6 (patch) | |
| tree | a49615ca3fc4514942e4d81b4246622d36f6b28d /fs/btrfs | |
| parent | Btrfs: fix NULL pointer dereference in log_dir_items (diff) | |
| download | linux-dev-b98def7ca6e152ee55e36863dddf6f41f12d1dc6.tar.xz linux-dev-b98def7ca6e152ee55e36863dddf6f41f12d1dc6.zip | |
Btrfs: bail out on error during replay_dir_deletes
If errors were returned by btrfs_next_leaf(), replay_dir_deletes needs
to bail out, otherwise @ret would be forced to be 0 after 'break;' and
the caller won't be aware of it.
Fixes: e02119d5a7b4 ("Btrfs: Add a write ahead tree log to optimize synchronous operations")
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/tree-log.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index c6bfa86e2f22..678154d4b78f 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2352,8 +2352,10 @@ again: nritems = btrfs_header_nritems(path->nodes[0]); if (path->slots[0] >= nritems) { ret = btrfs_next_leaf(root, path); - if (ret) + if (ret == 1) break; + else if (ret < 0) + goto out; } btrfs_item_key_to_cpu(path->nodes[0], &found_key, path->slots[0]); |