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/props.c | |
| parent | c2fcdcdf36bba08c5d2fbf4f17c2d8a944bfd4df (diff) | |
| download | linux-b52aa8c93e1fec97fcd87345b13f532f0dee8239.tar.bz2 | |
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/props.c')
| -rw-r--r-- | fs/btrfs/props.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index 4b23ae5d0e5c..916f5cf9b292 100644 --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -403,7 +403,7 @@ static int prop_compression_apply(struct inode *inode, if (len == 0) { BTRFS_I(inode)->flags |= BTRFS_INODE_NOCOMPRESS; BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; - BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_NONE; + BTRFS_I(inode)->prop_compress = BTRFS_COMPRESS_NONE; return 0; } @@ -417,14 +417,14 @@ static int prop_compression_apply(struct inode *inode, BTRFS_I(inode)->flags &= ~BTRFS_INODE_NOCOMPRESS; BTRFS_I(inode)->flags |= BTRFS_INODE_COMPRESS; - BTRFS_I(inode)->force_compress = type; + BTRFS_I(inode)->prop_compress = type; return 0; } static const char *prop_compression_extract(struct inode *inode) { - switch (BTRFS_I(inode)->force_compress) { + switch (BTRFS_I(inode)->prop_compress) { case BTRFS_COMPRESS_ZLIB: return "zlib"; case BTRFS_COMPRESS_LZO: |