From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AFF3364B7; Fri, 24 Nov 2023 19:27:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sEWs6qXH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05003C433C8; Fri, 24 Nov 2023 19:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700854032; bh=PFMRrkYrQ/BwwJBd2LdpNGS3iFKsIIoY2MD11nVAG80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sEWs6qXHOyW5Ck8RTO2e3V2DZ/2/ZVd/tpeZgSGWQtyYU4nLcYno6i/tDRVy5/eOU Z4Eqej6SYylsGbvS00l6oQN5mVNMnmD1/DWrW7xNIVT28A33Jl+CIP38fYfnjKRe1v 8a0PGmioTrOxSvKjCNvvYNqV6s8DQQcaH0fOYSzs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kemeng Shi , Theodore Tso , stable@kernel.org Subject: [PATCH 5.4 129/159] ext4: correct return value of ext4_convert_meta_bg Date: Fri, 24 Nov 2023 17:55:46 +0000 Message-ID: <20231124171947.197897239@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124171941.909624388@linuxfoundation.org> References: <20231124171941.909624388@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kemeng Shi commit 48f1551592c54f7d8e2befc72a99ff4e47f7dca0 upstream. Avoid to ignore error in "err". Signed-off-by: Kemeng Shi Link: https://lore.kernel.org/r/20230826174712.4059355-4-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- fs/ext4/resize.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1940,9 +1940,7 @@ static int ext4_convert_meta_bg(struct s errout: ret = ext4_journal_stop(handle); - if (!err) - err = ret; - return ret; + return err ? err : ret; invalid_resize_inode: ext4_error(sb, "corrupted/inconsistent resize inode");