Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c9ee856 authored by Qu Wenruo's avatar Qu Wenruo Committed by Chris Mason
Browse files

btrfs: Add noflushoncommit mount option. 



Add noflushoncommit mount option to disable flush on commit with
remount option.

Signed-off-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 53036293

Documentation/filesystems/btrfs.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,7 @@ Options with (*) are default options and will not show in the mount options. 
	  "bug" - BUG() on a fatal error.  This is the default.

	  "bug" - BUG() on a fatal error.  This is the default.

	  "panic" - panic() on a fatal error.

	  "panic" - panic() on a fatal error.





  noflushoncommit(*)

  flushoncommit

  flushoncommit

	The 'flushoncommit' mount option forces any data dirtied by a write in a

	The 'flushoncommit' mount option forces any data dirtied by a write in a

	prior transaction to commit as part of the current commit.  This makes

	prior transaction to commit as part of the current commit.  This makes

fs/btrfs/super.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,7 @@ enum { 
	Opt_check_integrity, Opt_check_integrity_including_extent_data,

	Opt_check_integrity, Opt_check_integrity_including_extent_data,

	Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree,

	Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree,

	Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,

	Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,

	Opt_noenospc_debug,

	Opt_noenospc_debug, Opt_noflushoncommit,

	Opt_err,

	Opt_err,

};

};
@@ -350,6 +350,7 @@ static match_table_t tokens = { 
	{Opt_noacl, "noacl"},

	{Opt_noacl, "noacl"},

	{Opt_notreelog, "notreelog"},

	{Opt_notreelog, "notreelog"},

	{Opt_flushoncommit, "flushoncommit"},

	{Opt_flushoncommit, "flushoncommit"},

	{Opt_noflushoncommit, "noflushoncommit"},

	{Opt_ratio, "metadata_ratio=%d"},

	{Opt_ratio, "metadata_ratio=%d"},

	{Opt_discard, "discard"},

	{Opt_discard, "discard"},

	{Opt_nodiscard, "nodiscard"},

	{Opt_nodiscard, "nodiscard"},
@@ -562,6 +563,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
			btrfs_info(root->fs_info, "turning on flush-on-commit");

			btrfs_info(root->fs_info, "turning on flush-on-commit");

			btrfs_set_opt(info->mount_opt, FLUSHONCOMMIT);

			btrfs_set_opt(info->mount_opt, FLUSHONCOMMIT);

			break;

			break;

		case Opt_noflushoncommit:

			if (btrfs_test_opt(root, FLUSHONCOMMIT))

				btrfs_info(root->fs_info, "turning off flush-on-commit");

			btrfs_clear_opt(info->mount_opt, FLUSHONCOMMIT);

			break;

		case Opt_ratio:

		case Opt_ratio:

			ret = match_int(&args[0], &intarg);

			ret = match_int(&args[0], &intarg);

			if (ret) {

			if (ret) {