Re: [PATCH 2/5] btrfs: correct a message on setting nodatacow
From: Qu Wenruo <hidden>
Date: 2014-09-19 02:03:55
-------- Original Message -------- Subject: [PATCH 2/5] btrfs: correct a message on setting nodatacow From: Satoru Takeuchi <redacted> To: linux-btrfs@vger.kernel.org <redacted> Date: 2014年09月18日 16:28
quoted hunk ↗ jump to hunk
From: Naohiro Aota <redacted> If we set nodatacow mount option after compress-force option, we don't get compression disabling message. === $ sudo mount -o remount,compress-force,nodatacow /; dmesg|tail -n 3 [ 3845.719047] BTRFS info (device vda2): force zlib compression [ 3845.719052] BTRFS info (device vda2): setting nodatacow [ 3845.719055] BTRFS info (device vda2): disk space caching is enabled === Signed-off-by: Naohiro Aota <redacted> Signed-off-by: Satoru Takeuchi <redacted> --- fs/btrfs/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index d1c5b6d..d131098 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c@@ -462,8 +462,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) break; case Opt_nodatacow: if (!btrfs_test_opt(root, NODATACOW)) { - if (!btrfs_test_opt(root, COMPRESS) || - !btrfs_test_opt(root, FORCE_COMPRESS)) { + if (btrfs_test_opt(root, COMPRESS)) { btrfs_info(root->fs_info, "setting nodatacow, compression disabled"); } else { -- 1.8.3.1 --To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Although the patch makes the output ok, the core problem is missing conflict options check. compress-force mount options implies datacow and datasum, but following nodatasum will disable datasum and compress, in fact they are conflicting mount option... Even the current behavior(later mount option will override previous ones) provides great tolerance, IMO there should better be some conflicting check for mount options. For example, we first save all the mount options passed in into a temporary bitmaps to finds out the conflicting and only when they contains no conflicts, set the mount options to fs_info. (Maybe bitmap is not enough for this case, since we can't distinguish default value and value to be set?) What do you think about this idea ? Thanks, Qu