Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6197d86e authored by David Sterba's avatar David Sterba
Browse files

btrfs: return void from readahead_tree_block 



Errors in readahead are not fatal and ignored elsewhere in the code.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 58dc4ce4

fs/btrfs/disk-io.c

+2 −4
Original line number Diff line number Diff line
@@ -1062,19 +1062,17 @@ static const struct address_space_operations btree_aops = { 
	.set_page_dirty = btree_set_page_dirty,

};



int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)

void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)

{

	struct extent_buffer *buf = NULL;

	struct inode *btree_inode = root->fs_info->btree_inode;

	int ret = 0;



	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

	if (!buf)

		return 0;

		return;

	read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,

				 buf, 0, WAIT_NONE, btree_get_extent, 0);

	free_extent_buffer(buf);

	return ret;

}



int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct btrfs_fs_devices; 


struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,

				      u32 blocksize, u64 parent_transid);

int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize);

void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize);

int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 int mirror_num, struct extent_buffer **eb);

struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

fs/btrfs/extent-tree.c

+1 −3
Original line number Diff line number Diff line
@@ -7486,9 +7486,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans, 
				continue;

		}

reada:

		ret = readahead_tree_block(root, bytenr, blocksize);

		if (ret)

			break;

		readahead_tree_block(root, bytenr, blocksize);

		nread++;

	}

	wc->reada_slot = slot;