From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 04/11] ext4: simplify handling of the errors=* mount options
Date: Sun, 4 Mar 2012 22:08:18 -0500 [thread overview]
Message-ID: <1330916905-5976-4-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1330916905-5976-1-git-send-email-tytso@mit.edu>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/ext4/ext4.h | 1 +
fs/ext4/super.c | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index df93dc1..d70b981 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -924,6 +924,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_ERRORS_CONT 0x00010 /* Continue on errors */
#define EXT4_MOUNT_ERRORS_RO 0x00020 /* Remount fs ro on errors */
#define EXT4_MOUNT_ERRORS_PANIC 0x00040 /* Panic on errors */
+#define EXT4_MOUNT_ERRORS_MASK 0x00070
#define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */
#define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/
#define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6b27bc6..93cca1f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1565,18 +1565,15 @@ static int parse_options(char *options, struct super_block *sb,
/* *sb_block = match_int(&args[0]); */
break;
case Opt_err_panic:
- clear_opt(sb, ERRORS_CONT);
- clear_opt(sb, ERRORS_RO);
+ clear_opt(sb, ERRORS_MASK);
set_opt(sb, ERRORS_PANIC);
break;
case Opt_err_ro:
- clear_opt(sb, ERRORS_CONT);
- clear_opt(sb, ERRORS_PANIC);
+ clear_opt(sb, ERRORS_MASK);
set_opt(sb, ERRORS_RO);
break;
case Opt_err_cont:
- clear_opt(sb, ERRORS_RO);
- clear_opt(sb, ERRORS_PANIC);
+ clear_opt(sb, ERRORS_MASK);
set_opt(sb, ERRORS_CONT);
break;
case Opt_nouid32:
--
1.7.9.107.g97f9a
next prev parent reply other threads:[~2012-03-05 3:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 3:08 [PATCH 01/11] ext4: remove deprecation warnings for minix_df and grpid Theodore Ts'o
2012-03-05 3:08 ` [PATCH 02/11] ext4: remove Opt_ignore Theodore Ts'o
2012-03-05 3:08 ` [PATCH 03/11] ext4: remove the I_VERSION mount flag and use the super_block flag instead Theodore Ts'o
2012-03-05 3:08 ` Theodore Ts'o [this message]
2012-03-05 3:08 ` [PATCH 05/11] ext4: unify handling of mount options which have been removed Theodore Ts'o
2012-03-05 3:08 ` [PATCH 06/11] ext4: use a table-driven handler for mount options Theodore Ts'o
2012-03-05 3:08 ` [PATCH 07/11] ext4: move ext4_show_options() after parse_options() Theodore Ts'o
2012-03-05 3:08 ` [PATCH 08/11] ext4: make ext4_show_options() be table-driven Theodore Ts'o
2012-03-05 3:08 ` [PATCH 09/11] ext4: add debugging /proc file showing file system options Theodore Ts'o
2012-03-05 3:08 ` [PATCH 10/11] ext4: ignore mount options supported by ext2/3 (but have since been removed) Theodore Ts'o
2012-03-05 3:08 ` [PATCH 11/11] ext4: try to deprecate noacl and noxattr_user mount options Theodore Ts'o
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=1330916905-5976-4-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-ext4@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).