diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-21 05:00:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-21 05:00:55 -0700 |
| commit | ce96e448b2a57a6ec43a91a24d1dbb3f5f4095e3 (patch) | |
| tree | 4f3b6e1a6fa91d46f6265d3134418debd77848bc /fs/btrfs/extent_io.c | |
| parent | b23c3fca0596a7e23dc26cb54b719774eb7d3045 (diff) | |
| parent | 78cbd38fd58116df6d09bfc6166cf57b90d0711d (diff) | |
Merge "Merge tag 'lsk-v4.4-17.02-android' into branch 'msm-4.4'"
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 257bbdcb5df6..e767f347f2b1 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5294,11 +5294,20 @@ 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 = start_i; i < num_pages; i++) { + page = eb->pages[i]; if (!PageUptodate(page)) { num_reads++; all_uptodate = 0; } } + if (all_uptodate) { if (start_i == 0) set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags); |