From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DA26C433E1 for ; Mon, 24 Aug 2020 16:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 561582067C for ; Mon, 24 Aug 2020 16:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598288318; bh=0sF2i8X150aJR9s1ThR83KFzBqql1OUgtwul40T7+EY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=atImaKn1OcLlU/AwN/b8BfyzkrJtsyJKHIjNwwTactEJCMHGAjN0ZwlEyacq71wGV XWV2a4gtePcKGaYwpspAR8LdhVaWcWHdZl7i4yrzfpYfPZ0vLJvnPZzmzzSOgMRh/g IDByub9hEBm/p/H4gnLGjGtqtf0GAve+ON3NYqDw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726809AbgHXQ6h (ORCPT ); Mon, 24 Aug 2020 12:58:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:46170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728512AbgHXQiy (ORCPT ); Mon, 24 Aug 2020 12:38:54 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 26C3F22D37; Mon, 24 Aug 2020 16:38:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598287133; bh=0sF2i8X150aJR9s1ThR83KFzBqql1OUgtwul40T7+EY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qmd9YCgjoc//q8m+3J1UZAZDyeQjhxboFUcc8V8f85vxl2DPY8eFVYXbNJEpWeR+J rki/78v6SU3SfRx+lYpEaBU3zTAPfk5T8QvY33IHiXjGfeRCcD84A9oreYFUy0BANz ZyLkTMQrhUHnK70L9ddITZL+2zV1zTdSMSQLgYSw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan Kara , Lukas Czerner , Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 06/21] ext4: handle error of ext4_setup_system_zone() on remount Date: Mon, 24 Aug 2020 12:38:30 -0400 Message-Id: <20200824163845.606933-6-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163845.606933-1-sashal@kernel.org> References: <20200824163845.606933-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kara [ Upstream commit d176b1f62f242ab259ff665a26fbac69db1aecba ] ext4_setup_system_zone() can fail. Handle the failure in ext4_remount(). Reviewed-by: Lukas Czerner Signed-off-by: Jan Kara Link: https://lore.kernel.org/r/20200728130437.7804-2-jack@suse.cz Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- 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 03ebb0b385467..daabd7a2cee81 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5470,7 +5470,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