Merge branches 'pm-sleep' and 'pm-devfreq'

[mirror_ubuntu-jammy-kernel.git] / fs / btrfs / compression.c

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 43e1660f450f01ba8b6326d54e1bfdc6162a8080..9ab610cc91142092765fb8a1eca310e30d35ab7c 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -763,7 +763,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
 
                        if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {
                                ret = btrfs_lookup_bio_sums(inode, comp_bio,
-                                                           sums);
+                                                           (u64)-1, sums);
                                BUG_ON(ret); /* -ENOMEM */
                        }
 
@@ -791,7 +791,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
        BUG_ON(ret); /* -ENOMEM */
 
        if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {
-               ret = btrfs_lookup_bio_sums(inode, comp_bio, sums);
+               ret = btrfs_lookup_bio_sums(inode, comp_bio, (u64)-1, sums);
                BUG_ON(ret); /* -ENOMEM */
        }
 
@@ -1290,7 +1290,7 @@ int btrfs_decompress_buf2page(const char *buf, unsigned long buf_start,
        /* copy bytes from the working buffer into the pages */
        while (working_bytes > 0) {
                bytes = min_t(unsigned long, bvec.bv_len,
-                               PAGE_SIZE - buf_offset);
+                               PAGE_SIZE - (buf_offset % PAGE_SIZE));
                bytes = min(bytes, working_bytes);
 
                kaddr = kmap_atomic(bvec.bv_page);