From: Georg Altmann <george@george-net.de>
To: tytso@mit.edu
Cc: adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org,
linux-kernel@vger.kernel.org,
Georg Altmann <george@george-net.de>
Subject: [PATCH] ext4: clarify error messages for mounting fs w/o journal /w journal options
Date: Fri, 12 Feb 2016 14:31:49 +0100 [thread overview]
Message-ID: <1455283909-23354-1-git-send-email-george@george-net.de> (raw)
Previous message was hard to understand: When mounting a ext4 fs without a
journal, but a mount option that controls journaling is used, clearly state
that the fs cannot be mounted with this option because it has no journal.
See also comments at
https://bugs.archlinux.org/task/48135
Signed-off-by: Georg Altmann <george@george-net.de>
---
fs/ext4/super.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 486e869..4c50f0d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3716,25 +3716,25 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
} else {
/* Nojournal mode, all journal mount options are illegal */
if (test_opt2(sb, EXPLICIT_JOURNAL_CHECKSUM)) {
- ext4_msg(sb, KERN_ERR, "can't mount with "
- "journal_checksum, fs mounted w/o journal");
+ ext4_msg(sb, KERN_ERR, "can't mount with option "
+ "journal_checksum, fs has no journal");
goto failed_mount_wq;
}
if (test_opt(sb, JOURNAL_ASYNC_COMMIT)) {
- ext4_msg(sb, KERN_ERR, "can't mount with "
- "journal_async_commit, fs mounted w/o journal");
+ ext4_msg(sb, KERN_ERR, "can't mount with option "
+ "journal_async_commit, fs has no journal");
goto failed_mount_wq;
}
if (sbi->s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ) {
- ext4_msg(sb, KERN_ERR, "can't mount with "
- "commit=%lu, fs mounted w/o journal",
+ ext4_msg(sb, KERN_ERR, "can't mount with option "
+ "commit=%lu, fs has no journal",
sbi->s_commit_interval / HZ);
goto failed_mount_wq;
}
if (EXT4_MOUNT_DATA_FLAGS &
(sbi->s_mount_opt ^ sbi->s_def_mount_opt)) {
- ext4_msg(sb, KERN_ERR, "can't mount with "
- "data=, fs mounted w/o journal");
+ ext4_msg(sb, KERN_ERR, "can't mount with option "
+ "data=, fs has no journal");
goto failed_mount_wq;
}
sbi->s_def_mount_opt &= EXT4_MOUNT_JOURNAL_CHECKSUM;
--
2.7.1
next reply other threads:[~2016-02-12 13:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-12 13:31 Georg Altmann [this message]
2016-02-12 17:03 ` [PATCH] ext4: clarify error messages for mounting fs w/o journal /w journal options Theodore Ts'o
2016-02-12 17:32 ` Georg Altmann
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=1455283909-23354-1-git-send-email-george@george-net.de \
--to=george@george-net.de \
--cc=adilger.kernel@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/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).