diff options
| author | Wang Shilong | 2014-06-30 04:51:25 +0200 |
|---|---|---|
| committer | Chris Mason | 2014-09-17 22:37:19 +0200 |
| commit | 4027e0f4c4b2df28d564560a3c65c179bebae4c8 (patch) | |
| tree | 64a0fcf3ad7ee643f9049fcefa52bd22059c461e /fs/btrfs/super.c | |
| parent | btrfs: use DIV_ROUND_UP instead of open-coded variants (diff) | |
| download | kernel-qcow2-linux-4027e0f4c4b2df28d564560a3c65c179bebae4c8.tar.gz kernel-qcow2-linux-4027e0f4c4b2df28d564560a3c65c179bebae4c8.tar.xz kernel-qcow2-linux-4027e0f4c4b2df28d564560a3c65c179bebae4c8.zip | |
Btrfs: clear compress-force when remounting with compress option
Steps to reproduce:
# mkfs.btrfs -f /dev/sdb
# mount /dev/sdb /mnt -o compress-force=lzo
# mount /dev/sdb /mnt -o remount,compress=zlib
# cat /proc/mounts
Remounting from compress-force to compress could not clear compress-force
option. The problem is there is no way for users to clear compress-force
option separately.
Fix this problem by clearing @FORCE_COMPRESS flag when remounting to
compress=xxx.
Suggested-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Reviewed-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Tested-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 568ddc16119f..d66fbd57f1b5 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -507,6 +507,13 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) btrfs_info(root->fs_info, "btrfs: use %s compression", compress_type); + /* + * If we remount from compress-force=xxx to + * compress=xxx, we need clear FORCE_COMPRESS + * flag, otherwise, there is no way for users + * to disable forcible compression separately. + */ + btrfs_clear_opt(info->mount_opt, FORCE_COMPRESS); } break; case Opt_ssd: |