compress_file_range can fail to compress either because of resource or
alignment constraints or because the data is incompressible. In the latter
case the inode is marked so that compression isn't tried again. Currently
that check is based on the condition that the pages array has been allocated
which is rather cryptic. Use a separate label to clearly distinguish this
case.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
fs/btrfs/inode.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 560682a5d9d7aa..00aabc088a9deb 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -949,7 +949,7 @@ static void compress_file_range(struct btrfs_work *work)
mapping, start, pages, &nr_pages, &total_in,
&total_compressed);
if (ret)
- goto cleanup_and_bail_uncompressed;
+ goto mark_incompressible;
/*
* Zero the tail end of the last page, as we might be sending it down
@@ -1025,7 +1025,7 @@ static void compress_file_range(struct btrfs_work *work)
*/
total_in = round_up(total_in, fs_info->sectorsize);
if (total_compressed + blocksize > total_in)
- goto cleanup_and_bail_uncompressed;
+ goto mark_incompressible;
/*
* The async work queues will take care of doing actual allocation on
@@ -1040,6 +1040,9 @@ static void compress_file_range(struct btrfs_work *work)
}
return;
+mark_incompressible:
+ if (!btrfs_test_opt(fs_info, FORCE_COMPRESS) && !inode->prop_compress)
+ inode->flags |= BTRFS_INODE_NOCOMPRESS;
cleanup_and_bail_uncompressed:
if (pages) {
/*
@@ -1054,12 +1057,6 @@ static void compress_file_range(struct btrfs_work *work)
pages = NULL;
total_compressed = 0;
nr_pages = 0;
-
- /* flag the file so we don't compress in the future */
- if (!btrfs_test_opt(fs_info, FORCE_COMPRESS) &&
- !(inode->prop_compress)) {
- inode->flags |= BTRFS_INODE_NOCOMPRESS;
- }
}
/*
--
2.39.2
