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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 25563C4321E for ; Fri, 10 Sep 2021 00:44:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12CA261186 for ; Fri, 10 Sep 2021 00:44:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241916AbhIJAqG (ORCPT ); Thu, 9 Sep 2021 20:46:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:49014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234526AbhIJAXg (ORCPT ); Thu, 9 Sep 2021 20:23:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5E58B60FDA; Fri, 10 Sep 2021 00:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631233346; bh=TAuuS2mVm87JZrYkrkwu9IrSlM/vuBvWZaAFUdiISos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZCBkJhrd9nRV8g33e03YEWJte3sSyLCzqob4B+yrIC8c+0XiSaksiPCM9KdCeckmo a2z89T9dhT2b4pUB8bG2eFbGP6bBaOMymOEwnjJEcsTWQixlQ7GWZVQfcsYl4a8KOc c+uTgVrWi0hjgcvQt07hxG/SmvTserL2U/JysynVqNzII1lnbyx/OwdcX9sJwbPQnz YjtMvlnAwcmT+ZDI3l/ZYQEU6YUB/1mVpGWF8In6XpOBtwMh8e4D7vFSwgbGVSL1Ll d9LalpWqYj0EjtkenYG6bd3bokEiPHNytWUOXD8dWKVoVRxH7HMbBIWGxqTyY0ZpYJ gK7rTEzRtDLQg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Theodore Ts'o , yangerkun , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 32/37] ext4: if zeroout fails fall back to splitting the extent node Date: Thu, 9 Sep 2021 20:21:37 -0400 Message-Id: <20210910002143.175731-32-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210910002143.175731-1-sashal@kernel.org> References: <20210910002143.175731-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Theodore Ts'o [ Upstream commit 308c57ccf4318236be75dfa251c84713e694457b ] If the underlying storage device is using thin-provisioning, it's possible for a zeroout operation to return ENOSPC. Commit df22291ff0fd ("ext4: Retry block allocation if we have free blocks left") added logic to retry block allocation since we might get free block after we commit a transaction. But the ENOSPC from thin-provisioning will confuse ext4, and lead to an infinite loop. Since using zeroout instead of splitting the extent node is an optimization, if it fails, we might as well fall back to splitting the extent node. Reported-by: yangerkun Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/extents.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index ae73e6793683..4136aafd9b7f 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3740,7 +3740,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, split_map.m_len - ee_block); err = ext4_ext_zeroout(inode, &zero_ex1); if (err) - goto out; + goto fallback; split_map.m_len = allocated; } if (split_map.m_lblk - ee_block + split_map.m_len < @@ -3754,7 +3754,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, ext4_ext_pblock(ex)); err = ext4_ext_zeroout(inode, &zero_ex2); if (err) - goto out; + goto fallback; } split_map.m_len += split_map.m_lblk - ee_block; @@ -3763,6 +3763,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, } } +fallback: err = ext4_split_extent(handle, inode, ppath, &split_map, split_flag, flags); if (err > 0) -- 2.30.2