btrfs: reada, sink start parameter to btree_readahead_hook (fc2e901f) · Commits · 戴 / test

fs/btrfs/ctree.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3661,7 +3661,7 @@ struct reada_control btrfs_reada_add(struct btrfs_root root,
		int btrfs_reada_wait(void *handle);
		void btrfs_reada_detach(void *handle);
		int btree_readahead_hook(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb, u64 start, int err);
		struct extent_buffer *eb, int err);

		static inline int is_fstree(u64 rootid)
		{

+2 −2

Original line number	Diff line number	Diff line
		@@ -747,7 +747,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
		err:
		if (reads_done &&
		test_and_clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags))
		btree_readahead_hook(fs_info, eb, eb->start, ret);
		btree_readahead_hook(fs_info, eb, ret);

		if (ret) {
		/*
		@@ -772,7 +772,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)
		eb->read_mirror = failed_mirror;
		atomic_dec(&eb->io_pages);
		if (test_and_clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags))
		btree_readahead_hook(eb->fs_info, eb, eb->start, -EIO);
		btree_readahead_hook(eb->fs_info, eb, -EIO);
		return -EIO; /* we fixed nothing */
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -209,12 +209,8 @@ cleanup:
		return;
		}

		/*
		* start is passed separately in case eb in NULL, which may be the case with
		* failed I/O
		*/
		int btree_readahead_hook(struct btrfs_fs_info *fs_info,
		struct extent_buffer *eb, u64 start, int err)
		struct extent_buffer *eb, int err)
		{
		int ret = 0;
		struct reada_extent *re;
		@@ -222,7 +218,7 @@ int btree_readahead_hook(struct btrfs_fs_info *fs_info,
		/* find extent */
		spin_lock(&fs_info->reada_lock);
		re = radix_tree_lookup(&fs_info->reada_tree,
		start >> PAGE_SHIFT);
		eb->start >> PAGE_SHIFT);
		if (re)
		re->refcnt++;
		spin_unlock(&fs_info->reada_lock);