All of lore.kernel.org
 help / color / mirror / Atom feed
* [Ocfs2-devel] [PATCH] ocfs2: return -EROFS to upper if inode block is invalid
@ 2017-12-26  2:11 piaojun
  2017-12-26  2:22 ` Gang He
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: piaojun @ 2017-12-26  2:11 UTC (permalink / raw)
  To: ocfs2-devel

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;
-- 

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2017-12-26  7:05 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-26  2:11 [Ocfs2-devel] [PATCH] ocfs2: return -EROFS to upper if inode block is invalid piaojun
2017-12-26  2:22 ` 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

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.