[PATCH] btrfs: simplify read_extent_buffer_pages a bit

Johannes Thumshirn
2019-04-11T16:41:06Z

Currently read_extent_buffer_pages() uses a 4 pass algorithm to read an
extent buffer's pages from disk, all 4 stages looping over all pages of
the extent buffer.

1) Loop over all pages and lock them.
2) Loop over all pages and see if one is not marked as PageUptodate, so we
can break out of the function early.
3) Loop over all pages and if the page is !PageUptodate read the page,
otherwise unlock the page.
4) Loop over all pages and wait for stable pages.

Unify the 1st two for loops, we can count the number of uptodate pages
after we have locked them without the need for re-starting the loop.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
fs/btrfs/extent_io.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 828708f6510c..1d538bda4929 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -5357,14 +5357,12 @@ int read_extent_buffer_pages(struct extent_io_tree *tree,
lock_page(page);
}
locked_pages++;
- }
- /*
- * We need to firstly lock all pages to make sure that
- * the uptodate bit of our pages won't be affected by
- * clear_extent_buffer_uptodate().
- */
- for (i = 0; i < num_pages; i++) {
- page = eb->pages[i];
+
+ /*
+ * We need to firstly lock all pages to make sure that
+ * the uptodate bit of our pages won't be affected by
+ * clear_extent_buffer_uptodate().
+ */
if (!PageUptodate(page)) {
num_reads++;
all_uptodate = 0;
--
2.16.4