1 files changed, 5 insertions, 1 deletions

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index b189bd1e7a3e..37dff5b2d56d 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -639,7 +639,11 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         faili = nr_pages - 1;
         cb->nr_pages = nr_pages;
 
-        add_ra_bio_pages(inode, em_start + em_len, cb);
+        /* In the parent-locked case, we only locked the range we are
+         * interested in.  In all other cases, we can opportunistically
+         * cache decompressed data that goes beyond the requested range. */
+        if (!(bio_flags & EXTENT_BIO_PARENT_LOCKED))
+                add_ra_bio_pages(inode, em_start + em_len, cb);
 
         /* include any pages we added in add_ra-bio_pages */
         uncompressed_len = bio->bi_vcnt * PAGE_CACHE_SIZE;