diff options
| author | David Sterba <dsterba@suse.com> | 2017-07-17 19:41:31 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-08-16 16:12:05 +0200 |
| commit | eec63c65dcbeb14b59c95159eb225b1fc2310806 (patch) | |
| tree | f2c54de48515e48eea07a5ccd0ead6c990fe3a8f /fs/btrfs/btrfs_inode.h | |
| parent | b52aa8c93e1fec97fcd87345b13f532f0dee8239 (diff) | |
| download | linux-eec63c65dcbeb14b59c95159eb225b1fc2310806.tar.bz2 | |
btrfs: separate defrag and property compression
Add new value for compression to distinguish between defrag and
property. Previously, a single variable was used and this caused clashes
when the per-file 'compression' was set and a defrag -c was called.
The property-compression is loaded when the file is open, defrag will
overwrite the same variable and reset to 0 (ie. NONE) at when the file
defragmentaion is finished. That's considered a usability bug.
Now we won't touch the property value, use the defrag-compression. The
precedence of defrag is higher than for property (and whole-filesystem).
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/btrfs_inode.h')
| -rw-r--r-- | fs/btrfs/btrfs_inode.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index fa118036a84e..eccadb5f62a5 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -182,6 +182,11 @@ struct btrfs_inode { * Cached values of inode properties */ unsigned prop_compress; /* per-file compression algorithm */ + /* + * Force compression on the file using the defrag ioctl, could be + * different from prop_compress and takes precedence if set + */ + unsigned defrag_compress; struct btrfs_delayed_node *delayed_node; |