linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 03/11] btrfs: Add nocheck_int mount option.
Date: Fri, 3 Jan 2014 14:10:26 +0800	[thread overview]
Message-ID: <1388729434-19799-4-git-send-email-quwenruo@cn.fujitsu.com> (raw)
In-Reply-To: <1388729434-19799-1-git-send-email-quwenruo@cn.fujitsu.com>

Add nocheck_int mount option to disable integrity check with
remount option.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
changelog:
v2: add nocheck_int mount option
---
 Documentation/filesystems/btrfs.txt |  3 +++
 fs/btrfs/super.c                    | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index 65e885f..aab54e9 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -53,6 +53,7 @@ Options with (*) are default options and will not show in the mount options.
 	them up for the defrag process.  Works best for small files;
 	Not well suited for large database workloads.
 
+  nocheck_int(*)
   check_int
   check_int_data
   check_int_print_mask=<value>
@@ -70,6 +71,8 @@ Options with (*) are default options and will not show in the mount options.
 	as defined in fs/btrfs/check-integrity.c, to control the integrity
 	checker module behavior.
 
+	nocheck_int disables all the debug options above.
+
 	See comments at the top of fs/btrfs/check-integrity.c for more info.
 
   commit=<seconds>
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index c65f696..b408d05 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -323,7 +323,7 @@ enum {
 	Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
 	Opt_check_integrity, Opt_check_integrity_including_extent_data,
 	Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree,
-	Opt_commit_interval, Opt_barrier, Opt_nodefrag,
+	Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nocheck_integrity,
 	Opt_err,
 };
 
@@ -363,6 +363,7 @@ static match_table_t tokens = {
 	{Opt_recovery, "recovery"},
 	{Opt_skip_balance, "skip_balance"},
 	{Opt_check_integrity, "check_int"},
+	{Opt_nocheck_integrity, "nocheck_int"},
 	{Opt_check_integrity_including_extent_data, "check_int_data"},
 	{Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
 	{Opt_rescan_uuid_tree, "rescan_uuid_tree"},
@@ -616,6 +617,17 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
 			btrfs_set_opt(info->mount_opt, SKIP_BALANCE);
 			break;
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+		case Opt_nocheck_integrity:
+			if (btrfs_test_opt(root, CHECK_INTEGRITY) ||
+			    btrfs_test_opt(root,
+				    CHECK_INTEGRITY_INCLUDING_EXTENT_DATA) ||
+			    info->check_integrity_print_mask != 0)
+				btrfs_info(root->fs_info, "disabling any integrity check");
+			btrfs_clear_opt(info->mount_opt, CHECK_INTEGRITY);
+			btrfs_clear_opt(info->mount_opt,
+					CHECK_INTEGRITY_INCLUDING_EXTENT_DATA);
+			info->check_integrity_print_mask = 0;
+			break;
 		case Opt_check_integrity_including_extent_data:
 			btrfs_info(root->fs_info,
 				   "enabling check integrity including extent data");
@@ -641,6 +653,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
 			}
 			break;
 #else
+		case Opt_nocheck_integrity:
 		case Opt_check_integrity_including_extent_data:
 		case Opt_check_integrity:
 		case Opt_check_integrity_print_mask:
-- 
1.8.5.2


  parent reply	other threads:[~2014-01-03  6:09 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-03  6:10 [PATCH v2 00/11] btrfs: Add missing pairing mount options Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 01/11] btrfs: Add "barrier" option to support "-o remount,barrier" Qu Wenruo
2014-01-03  8:44   ` Mike Fleetwood
2014-01-03  9:20     ` Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 02/11] btrfs: Add noautodefrag mount option Qu Wenruo
2014-01-03  6:10 ` Qu Wenruo [this message]
2014-01-03 17:13   ` [PATCH v2 03/11] btrfs: Add nocheck_int " David Sterba
2014-01-06  0:51     ` Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 04/11] btrfs: Add nodiscard " Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 05/11] btrfs: Add noenospc_debug " Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 06/11] btrfs: Add noflushoncommit " Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 07/11] btrfs: Add noinode_cache " Qu Wenruo
2014-01-03 17:52   ` David Sterba
2014-01-06  0:54     ` Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 08/11] btrfs: Add acl " Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 09/11] btrfs: Add datacow " Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 10/11] btrfs: Add datasum " Qu Wenruo
2014-01-03  6:10 ` [PATCH v2 11/11] btrfs: Add treelog " Qu Wenruo
2014-01-03 17:52 ` [PATCH v2 00/11] btrfs: Add missing pairing mount options Eric Sandeen
2014-01-06  0:58   ` Qu Wenruo
2014-01-03 17:58 ` David Sterba
2014-01-06  1:01   ` 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=1388729434-19799-4-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).