From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 8/9] btrfs: Add datasum mount option.
Date: Mon, 6 Jan 2014 09:58:32 +0800 [thread overview]
Message-ID: <1388973513-11240-9-git-send-email-quwenruo@cn.fujitsu.com> (raw)
In-Reply-To: <1388973513-11240-1-git-send-email-quwenruo@cn.fujitsu.com>
Add datasum mount option to enable checksum with
remount option.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
---
Changelog:
v2: Add datasum option
v3: None
---
Documentation/filesystems/btrfs.txt | 4 +++-
fs/btrfs/super.c | 10 ++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index bbd1f0f..e05c6ae 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -159,8 +159,10 @@ Options with (*) are default options and will not show in the mount options.
Enable/disable data copy-on-write for newly created files.
Nodatacow implies nodatasum, and disables all compression.
+ datasum(*)
nodatasum
- Disable data checksumming for newly created files.
+ Enable/disable data checksumming for newly created files.
+ Datasum implies datacow.
notreelog
Disable the tree logging used for fsync and O_SYNC writes.
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 1bf9202..fa74252 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -325,6 +325,7 @@ enum {
Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree,
Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl, Opt_datacow,
+ Opt_datasum,
Opt_err,
};
@@ -334,6 +335,7 @@ static match_table_t tokens = {
{Opt_subvolid, "subvolid=%s"},
{Opt_device, "device=%s"},
{Opt_nodatasum, "nodatasum"},
+ {Opt_datasum, "datasum"},
{Opt_nodatacow, "nodatacow"},
{Opt_datacow, "datacow"},
{Opt_nobarrier, "nobarrier"},
@@ -434,6 +436,14 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
btrfs_info(root->fs_info, "setting nodatasum");
btrfs_set_opt(info->mount_opt, NODATASUM);
break;
+ case Opt_datasum:
+ if (btrfs_test_opt(root, NODATACOW))
+ btrfs_info(root->fs_info, "setting datasum, datacow enabled");
+ else
+ btrfs_info(root->fs_info, "setting datasum");
+ btrfs_clear_opt(info->mount_opt, NODATACOW);
+ btrfs_clear_opt(info->mount_opt, NODATASUM);
+ break;
case Opt_nodatacow:
if (!btrfs_test_opt(root, COMPRESS) ||
!btrfs_test_opt(root, FORCE_COMPRESS)) {
--
1.8.5.2
next prev parent reply other threads:[~2014-01-06 1:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-06 1:58 [PATCH v3 0/9] btrfs: Add missing pairing mount options Qu Wenruo
2014-01-06 1:58 ` [PATCH v3 1/9] btrfs: Add "barrier" option to support "-o remount,barrier" Qu Wenruo
2014-01-06 1:58 ` [PATCH v3 2/9] btrfs: Add noautodefrag mount option Qu Wenruo
2014-01-06 1:58 ` [PATCH v3 3/9] btrfs: Add nodiscard " Qu Wenruo
2014-01-06 1:58 ` [PATCH v3 4/9] btrfs: Add noenospc_debug " Qu Wenruo
2014-01-06 1:58 ` [PATCH v3 5/9] btrfs: Add noflushoncommit " Qu Wenruo
2014-01-06 1:58 ` [PATCH v3 6/9] btrfs: Add acl " Qu Wenruo
2014-01-06 1:58 ` [PATCH v3 7/9] btrfs: Add datacow " Qu Wenruo
2014-01-06 1:58 ` Qu Wenruo [this message]
2014-01-06 1:58 ` [PATCH v3 9/9] btrfs: Add treelog " Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388973513-11240-9-git-send-email-quwenruo@cn.fujitsu.com \
--to=quwenruo@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).