From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH] btrfs: manage commit mount option as %u
Date: Tue, 13 Feb 2018 17:50:46 +0800 [thread overview]
Message-ID: <20180213095048.9550-5-anand.jain@oracle.com> (raw)
In-Reply-To: <20180213095048.9550-1-anand.jain@oracle.com>
As -o commit mount option is unsinged so manage it as %u
for token verifications, instead of %d.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/ctree.h | 2 +-
fs/btrfs/super.c | 26 ++++++++++----------------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 23b7e6756b15..80d1d4d12f9d 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -788,7 +788,7 @@ struct btrfs_fs_info {
unsigned long pending_changes;
unsigned long compress_type:4;
unsigned int compress_level;
- int commit_interval;
+ u32 commit_interval;
/*
* It is a suggestive number, the read side is safe even it gets a
* wrong number because we will write out the data into a regular
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 83e11bbacc17..0a299a0ded3a 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -385,7 +385,7 @@ static const match_table_t tokens = {
{Opt_check_integrity_print_mask, "check_int_print_mask=%u"},
{Opt_rescan_uuid_tree, "rescan_uuid_tree"},
{Opt_fatal_errors, "fatal_errors=%s"},
- {Opt_commit_interval, "commit=%d"},
+ {Opt_commit_interval, "commit=%u"},
#ifdef CONFIG_BTRFS_DEBUG
{Opt_fragment_data, "fragment=data"},
{Opt_fragment_metadata, "fragment=metadata"},
@@ -777,24 +777,18 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
case Opt_commit_interval:
intarg = 0;
ret = match_int(&args[0], &intarg);
- if (ret < 0) {
- btrfs_err(info, "invalid commit interval");
- ret = -EINVAL;
+ if (ret)
goto out;
- }
- if (intarg > 0) {
- if (intarg > 300) {
- btrfs_warn(info,
- "excessive commit interval %d",
- intarg);
- }
- info->commit_interval = intarg;
- } else {
+ if (intarg == 0) {
btrfs_info(info,
- "using default commit interval %ds",
+ "using default commit interval %us",
BTRFS_DEFAULT_COMMIT_INTERVAL);
- info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL;
+ intarg = BTRFS_DEFAULT_COMMIT_INTERVAL;
+ } else if (intarg > 300) {
+ btrfs_warn(info, "excessive commit interval %d",
+ intarg);
}
+ info->commit_interval = intarg;
break;
#ifdef CONFIG_BTRFS_DEBUG
case Opt_fragment_all:
@@ -1363,7 +1357,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
if (btrfs_test_opt(info, PANIC_ON_FATAL_ERROR))
seq_puts(seq, ",fatal_errors=panic");
if (info->commit_interval != BTRFS_DEFAULT_COMMIT_INTERVAL)
- seq_printf(seq, ",commit=%d", info->commit_interval);
+ seq_printf(seq, ",commit=%u", info->commit_interval);
#ifdef CONFIG_BTRFS_DEBUG
if (btrfs_test_opt(info, FRAGMENT_DATA))
seq_puts(seq, ",fragment=data");
--
2.7.0
next prev parent reply other threads:[~2018-02-13 9:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 9:50 [PATCH] btrfs: manage thread_pool mount option as %u Anand Jain
2018-02-13 9:50 ` [PATCH] btrfs: manage subvolid " Anand Jain
2018-02-13 16:10 ` David Sterba
2018-02-14 17:11 ` [PATCH v2] btrfs: verify subvolid mount parameter Anand Jain
2018-02-23 22:08 ` David Sterba
2018-02-14 17:15 ` [PATCH] btrfs: manage subvolid mount option as %u Anand Jain
2018-02-13 9:50 ` [PATCH] btrfs: manage metadata_ratio " Anand Jain
2018-02-13 9:50 ` [PATCH] btrfs: manage check_int_print_mask " Anand Jain
2018-02-13 9:50 ` Anand Jain [this message]
2018-02-13 9:50 ` [PATCH] btrfs: add a comment to mark the deprecated mount option Anand Jain
2018-02-13 9:50 ` [PATCH] btrfs: fix bare unsigned declarations Anand Jain
2018-02-13 16:58 ` David Sterba
2018-02-14 17:13 ` [PATCH v2] " Anand Jain
2018-02-23 22:12 ` David Sterba
2018-02-26 8:46 ` [PATCH v3] " Anand Jain
2018-03-07 16:07 ` David Sterba
2018-02-13 14:26 ` [PATCH] btrfs: manage thread_pool mount option as %u Nikolay Borisov
2018-02-13 15:18 ` Anand Jain
2018-02-13 15:34 ` Nikolay Borisov
2018-02-13 15:58 ` David Sterba
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=20180213095048.9550-5-anand.jain@oracle.com \
--to=anand.jain@oracle.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).