diff options
| author | Chris Mason <clm@fb.com> | 2016-02-10 16:51:38 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-02-10 16:51:38 -0800 |
| commit | 43d871f029dadfff1bab1ebe24c4268b86801ca5 (patch) | |
| tree | bb7880472ba406d4f5e00d6682ef6930f8d9be2f /fs/btrfs/compression.c | |
| parent | e410e34fad913dd568ec28d2a9949694324c14db (diff) | |
| parent | 0c0fe3b0fa45082cd752553fdb3a4b42503a118e (diff) | |
Merge branch 'integration-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index c473c42d7d6c..3346cd8f9910 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -637,11 +637,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, faili = nr_pages - 1; cb->nr_pages = nr_pages; - /* 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); + 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; |