From 1e20d1c45fd37fb085dee716e1f207959e8e5660 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 17 Jul 2017 20:42:03 +0200 Subject: [PATCH] btrfs: allow defrag compress to override NOCOMPRESS attribute Currently, the BTRFS_INODE_NOCOMPRESS will prevent any compression on a given file, except when the mount is force-compress. As users have reported on IRC, this will also prevent compression when requested by defrag (btrfs fi defrag -c file). The nocompress flag is set automatically by filesystem when the ratios are bad and the user would have to manually drop the bit in order to make defrag -c work. This is not good from the usability perspective. This patch will raise priority for the defrag -c over nocompress, ie. any file with NOCOMPRESS bit set will get defragmented. The bit will remain untouched. Alternate option was to also drop the nocompress bit and keep the decision logic as is, but I think this is not the right solution. Signed-off-by: David Sterba --- fs/btrfs/inode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1e8eb5e8551c..a17a61e2ff9d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -399,12 +399,12 @@ static inline int inode_need_compress(struct inode *inode, u64 start, u64 end) /* force compress */ if (btrfs_test_opt(fs_info, FORCE_COMPRESS)) return 1; - /* bad compression ratios */ - if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS) - return 0; /* defrag ioctl */ if (BTRFS_I(inode)->defrag_compress) return 1; + /* bad compression ratios */ + if (BTRFS_I(inode)->flags & BTRFS_INODE_NOCOMPRESS) + return 0; if (btrfs_test_opt(fs_info, COMPRESS) || BTRFS_I(inode)->flags & BTRFS_INODE_COMPRESS || BTRFS_I(inode)->prop_compress) -- 2.30.2