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=-10.1 required=3.0 tests=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 70D7AC55191 for ; Fri, 24 Apr 2020 12:31:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 479A120700 for ; Fri, 24 Apr 2020 12:31:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731493; bh=edshClquLjQLAskTiibmYotWxRfjfhE2CQvBtrwoN0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KPHtt1+0MDVEAaD/mpaT3sg6j3yEjK0f28KKp/xsh85tAFz/5aLxR42Duwz5xdfzD 9pwZFfhtLkGO3B/GW85Pqt+K6xs16qEUMMQbh///pEzP85ZzTxSTKfoeqisku7WR6Z OXuxmW0UTYwfnxCy95D1oPfM3KTT2UiXefYlFyvA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727902AbgDXMXQ (ORCPT ); Fri, 24 Apr 2020 08:23:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:52906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727895AbgDXMXQ (ORCPT ); Fri, 24 Apr 2020 08:23:16 -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 11D2A2087E; Fri, 24 Apr 2020 12:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587730995; bh=edshClquLjQLAskTiibmYotWxRfjfhE2CQvBtrwoN0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bun2ZAllrkmGXY6VnX9g67+lqG4qT3nmmXccD/knnzno/pXS2IMfs7vYpM7xfIfw+ kmERc014bgEq4Mbxm12Kh2AnYIuTQSNi0NiVPuvxYon8EYxM8+cNAImxSwCicvOJgV 6pxNiACINBXJxji3HNglurZAoO1JnQ+1GhUv8mrI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 33/38] ext4: increase wait time needed before reuse of deleted inode numbers Date: Fri, 24 Apr 2020 08:22:31 -0400 Message-Id: <20200424122237.9831-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200424122237.9831-1-sashal@kernel.org> References: <20200424122237.9831-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Theodore Ts'o [ Upstream commit a17a9d935dc4a50acefaf319d58030f1da7f115a ] Current wait times have proven to be too short to protect against inode reuses that lead to metadata inconsistencies. Now that we will retry the inode allocation if we can't find any recently deleted inodes, it's a lot safer to increase the recently deleted time from 5 seconds to a minute. Link: https://lore.kernel.org/r/20200414023925.273867-1-tytso@mit.edu Google-Bug-Id: 36602237 Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/ialloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index f95ee99091e4c..eab18b7b56e77 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -663,7 +663,7 @@ static int find_group_other(struct super_block *sb, struct inode *parent, * block has been written back to disk. (Yes, these values are * somewhat arbitrary...) */ -#define RECENTCY_MIN 5 +#define RECENTCY_MIN 60 #define RECENTCY_DIRTY 300 static int recently_deleted(struct super_block *sb, ext4_group_t group, int ino) -- 2.20.1