lkml.org 
[lkml]   [2020]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 115/255] ext4: handle error of ext4_setup_system_zone() on remount
    Date
    From: Jan Kara <jack@suse.cz>

    [ Upstream commit d176b1f62f242ab259ff665a26fbac69db1aecba ]

    ext4_setup_system_zone() can fail. Handle the failure in ext4_remount().

    Reviewed-by: Lukas Czerner <lczerner@redhat.com>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/20200728130437.7804-2-jack@suse.cz
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/ext4/super.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/fs/ext4/super.c b/fs/ext4/super.c
    index 85849e5b31b28..54d1c09329e55 100644
    --- a/fs/ext4/super.c
    +++ b/fs/ext4/super.c
    @@ -5716,7 +5716,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
    ext4_register_li_request(sb, first_not_zeroed);
    }

    - ext4_setup_system_zone(sb);
    + err = ext4_setup_system_zone(sb);
    + if (err)
    + goto restore_opts;
    +
    if (sbi->s_journal == NULL && !(old_sb_flags & SB_RDONLY)) {
    err = ext4_commit_super(sb, 1);
    if (err)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-01 17:46    [W:2.811 / U:0.952 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site