Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f79707b0 authored by Wang Shilong's avatar Wang Shilong Committed by Chris Mason
Browse files

Btrfs: fix wrong skipping compression for an inode 



If a file's compression ratios is bad, we will set NOCOMPRESS
flag for it, and it will skip compression for that inode next time.

However, if we remount fs to COMPRESS_FORCE, it still should try
if we could compress pages for that inode, this patch fix wrong
check for this problem.

Signed-off-by: default avatarWang Shilong <wangsl.fnst@cn.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent d447d0da

fs/btrfs/inode.c

+20 −5
Original line number Diff line number Diff line
@@ -348,6 +348,23 @@ static noinline int add_async_extent(struct async_cow *cow, 
	return 0;

}



static inline int inode_need_compress(struct inode *inode)

{

	struct btrfs_root *root = BTRFS_I(inode)->root;



	/* force compress */

	if (btrfs_test_opt(root, FORCE_COMPRESS))

		return 1;

	/* bad compression ratios */

	if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS)

		return 0;

	if (btrfs_test_opt(root, COMPRESS) ||

	    BTRFS_I(inode)->flags & BTRFS_INODE_COMPRESS ||

	    BTRFS_I(inode)->force_compress)

		return 1;

	return 0;

}



/*

 * we create compressed extents in two phases.  The first

 * phase compresses a range of pages that have already been
@@ -444,10 +461,7 @@ static noinline int compress_file_range(struct inode *inode, 
	 * inode has not been flagged as nocompress.  This flag can

	 * change at any time if we discover bad compression ratios.

	 */

	if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS) &&

	    (btrfs_test_opt(root, COMPRESS) ||

	     (BTRFS_I(inode)->force_compress) ||

	     (BTRFS_I(inode)->flags & BTRFS_INODE_COMPRESS))) {

	if (inode_need_compress(inode)) {

		WARN_ON(pages);

		pages = kzalloc(sizeof(struct page *) * nr_pages, GFP_NOFS);

		if (!pages) {
@@ -1094,7 +1108,8 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page, 
		async_cow->locked_page = locked_page;

		async_cow->start = start;



		if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS)

		if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS &&

		    !btrfs_test_opt(root, FORCE_COMPRESS))

			cur_end = end;

		else

			cur_end = min(end, start + 512 * 1024 - 1);