mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
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>
This commit is contained in:
parent
ed6078f703
commit
4027e0f4c4
1 changed files with 7 additions and 0 deletions
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue