diff options
author | David Sterba <dsterba@suse.com> | 2017-07-17 19:17:20 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-08-16 16:12:05 +0200 |
commit | b52aa8c93e1fec97fcd87345b13f532f0dee8239 (patch) | |
tree | 3d5cbb93ef75de3b7e920d5d608db61c3d621d74 /fs/btrfs/ioctl.c | |
parent | c2fcdcdf36bba08c5d2fbf4f17c2d8a944bfd4df (diff) | |
download | linux-stable-b52aa8c93e1fec97fcd87345b13f532f0dee8239.tar.gz linux-stable-b52aa8c93e1fec97fcd87345b13f532f0dee8239.tar.bz2 linux-stable-b52aa8c93e1fec97fcd87345b13f532f0dee8239.zip |
btrfs: rename variable holding per-inode compression type
This is preparatory for separating inode compression requested by defrag
and set via properties. This will fix a usability bug when defrag will
reset compression type to NONE. If the file has compression set via
property, it will not apply anymore (until next mount or reset through
command line).
We're going to fix that by adding another variable just for the defrag
call and won't touch the property. The defrag will have higher priority
when deciding whether to compress the data.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 8189cb328d4a..e1c15a2ac785 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1371,7 +1371,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, inode_lock(inode); if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS) - BTRFS_I(inode)->force_compress = compress_type; + BTRFS_I(inode)->prop_compress = compress_type; ret = cluster_pages_for_defrag(inode, pages, i, cluster); if (ret < 0) { inode_unlock(inode); @@ -1442,7 +1442,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, out_ra: if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS) { inode_lock(inode); - BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_NONE; + BTRFS_I(inode)->prop_compress = BTRFS_COMPRESS_NONE; inode_unlock(inode); } if (!file) |