lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 3.18 082/101] ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid
    Date
    From: piaojun <piaojun@huawei.com>

    [ Upstream commit 025bcbde3634b2c9b316f227fed13ad6ad6817fb ]

    If metadata is corrupted such as 'invalid inode block', we will get
    failed by calling 'mount()' and then set filesystem readonly as below:

    ocfs2_mount
    ocfs2_initialize_super
    ocfs2_init_global_system_inodes
    ocfs2_iget
    ocfs2_read_locked_inode
    ocfs2_validate_inode_block
    ocfs2_error
    ocfs2_handle_error
    ocfs2_set_ro_flag(osb, 0); // set readonly

    In this situation we need return -EROFS to 'mount.ocfs2', so that user
    can fix it by fsck. And then mount again. In addition, 'mount.ocfs2'
    should be updated correspondingly as it only return 1 for all errno.
    And I will post a patch for 'mount.ocfs2' too.

    Link: http://lkml.kernel.org/r/5A4302FA.2010606@huawei.com
    Signed-off-by: Jun Piao <piaojun@huawei.com>
    Reviewed-by: Alex Chen <alex.chen@huawei.com>
    Reviewed-by: Joseph Qi <jiangqi903@gmail.com>
    Reviewed-by: Changwei Ge <ge.changwei@h3c.com>
    Reviewed-by: Gang He <ghe@suse.com>
    Cc: Mark Fasheh <mfasheh@versity.com>
    Cc: Joel Becker <jlbec@evilplan.org>
    Cc: Junxiao Bi <junxiao.bi@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    fs/ocfs2/super.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
    index 93c85bc745e1..c8d4934fc1cc 100644
    --- a/fs/ocfs2/super.c
    +++ b/fs/ocfs2/super.c
    @@ -467,9 +467,8 @@ 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;
    + status = ocfs2_is_soft_readonly(osb) ? -EROFS : -EINVAL;
    mlog_errno(status);
    - /* FIXME: Should ERROR_RO_FS */
    mlog(ML_ERROR, "Unable to load system inode %d, "
    "possibly corrupt fs?", i);
    goto bail;
    @@ -498,7 +497,7 @@ 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;
    + status = ocfs2_is_soft_readonly(osb) ? -EROFS : -EINVAL;
    mlog(ML_ERROR, "status=%d, sysfile=%d, slot=%d\n",
    status, i, osb->slot_num);
    goto bail;
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 02:47    [W:4.117 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site