On Fri, May 23, 2014 at 11:36:52AM +0800, Wang Shilong wrote:
quoted hunk ↗ jump to hunk
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -513,6 +513,14 @@ 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_and_info(root, FORCE_COMPRESS,
+ "compress is not forced anymore");
This adds another message and does not make sense if it's not during
remount.
The message "btrfs: use %s compression" could be printed
unconditionally, we want to see that the compression is requested via
mount option.
Otherwise, the variable 'compress' does nothing useful and can be
removed as well.
}
break;
case Opt_ssd: