]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
btrfs: mark compressed range uptodate only if all bio succeed
authorGoldwyn Rodrigues <rgoldwyn@suse.de>
Fri, 9 Jul 2021 16:29:22 +0000 (11:29 -0500)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 20 Sep 2021 13:42:15 +0000 (15:42 +0200)
BugLink: https://bugs.launchpad.net/bugs/1940706
commit 240246f6b913b0c23733cfd2def1d283f8cc9bbe upstream.

In compression write endio sequence, the range which the compressed_bio
writes is marked as uptodate if the last bio of the compressed (sub)bios
is completed successfully. There could be previous bio which may
have failed which is recorded in cb->errors.

Set the writeback range as uptodate only if cb->errors is zero, as opposed
to checking only the last bio's status.

Backporting notes: in all versions up to 4.4 the last argument is always
replaced by "!cb->errors".

CC: stable@vger.kernel.org # 4.4+
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
fs/btrfs/compression.c

index 320aa87d26bf3c4d335ccff227ec124e3b18f6cc..6bd8307647f07e6b75ce7ce67232a7773af5a94a 100644 (file)
@@ -338,7 +338,7 @@ static void end_compressed_bio_write(struct bio *bio)
        cb->compressed_pages[0]->mapping = cb->inode->i_mapping;
        btrfs_writepage_endio_finish_ordered(cb->compressed_pages[0],
                        cb->start, cb->start + cb->len - 1,
-                       bio->bi_status == BLK_STS_OK);
+                       !cb->errors);
        cb->compressed_pages[0]->mapping = NULL;
 
        end_compressed_writeback(inode, cb);