Commit b98def7c authored Apr 03, 2018 by Liu Bo Committed by David Sterba Apr 05, 2018

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: e02119d5 ("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>

parent 80c0b421

fs/btrfs/tree-log.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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]);

Admin message