From: piaojun <piaojun@huawei.com>
To: ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH] ocfs2: return -EROFS to upper if inode block is invalid
Date: Tue, 26 Dec 2017 10:11:46 +0800 [thread overview]
Message-ID: <5A41AFE2.5010506@huawei.com> (raw)
If metadata is corrupted such as 'invalid inode block', we will get
failed by calling 'mount()' as below:
ocfs2_mount
ocfs2_initialize_super
ocfs2_init_global_system_inodes : return -EINVAL if inode is NULL
ocfs2_get_system_file_inode
_ocfs2_get_system_file_inode : return NULL if inode is errno
ocfs2_iget
ocfs2_read_locked_inode
ocfs2_validate_inode_block
In this situation we need return -EROFS to upper application, so that
user can fix it by fsck. And then mount again.
Signed-off-by: Jun Piao <piaojun@huawei.com>
Reviewed-by: Alex Chen <alex.chen@huawei.com>
---
fs/ocfs2/super.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 040bbb6..dea21a7 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -474,7 +474,10 @@ static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb)
new = ocfs2_get_system_file_inode(osb, i, osb->slot_num);
if (!new) {
ocfs2_release_system_inodes(osb);
- status = -EINVAL;
+ if (ocfs2_is_soft_readonly(osb))
+ status = -EROFS;
+ else
+ status = -EINVAL;
mlog_errno(status);
/* FIXME: Should ERROR_RO_FS */
mlog(ML_ERROR, "Unable to load system inode %d, "
@@ -505,7 +508,10 @@ static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb)
new = ocfs2_get_system_file_inode(osb, i, osb->slot_num);
if (!new) {
ocfs2_release_system_inodes(osb);
- status = -EINVAL;
+ if (ocfs2_is_soft_readonly(osb))
+ status = -EROFS;
+ else
+ status = -EINVAL;
mlog(ML_ERROR, "status=%d, sysfile=%d, slot=%d\n",
status, i, osb->slot_num);
goto bail;
--
next reply other threads:[~2017-12-26 2:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-26 2:11 piaojun [this message]
2017-12-26 2:22 ` [Ocfs2-devel] [PATCH] ocfs2: return -EROFS to upper if inode block is invalid Gang He
2017-12-26 2:31 ` piaojun
2017-12-26 3:05 ` Joseph Qi
2017-12-26 5:35 ` piaojun
2017-12-26 6:10 ` Joseph Qi
2017-12-26 6:45 ` piaojun
2017-12-26 6:59 ` Joseph Qi
2017-12-26 7:05 ` piaojun
2017-12-26 3:34 ` Changwei Ge
2017-12-26 5:41 ` piaojun
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=5A41AFE2.5010506@huawei.com \
--to=piaojun@huawei.com \
--cc=ocfs2-devel@oss.oracle.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.