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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 1667FC47253 for ; Fri, 1 May 2020 13:37:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9F412173E for ; Fri, 1 May 2020 13:37:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588340251; bh=21jnwet0trPW2Kv3E6ihRnckW6TR5od8KkJAPHwPeqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FlugtxyTTg6mKfSYxjkCxZtvNIqaAH20nxLsKEoPoD83aMHcYA8DQQ5n5Lmik2nw4 6KHxsAkvKA5XxuN8d7EHQQ3blyJ53Xsx5lVSGun93GAmClcSaScbE3Kmuha3AHXoWK w5psxgPbncq5C4fOaNXrGqd+mUwQwvrx8dE0JwcI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730706AbgEANha (ORCPT ); Fri, 1 May 2020 09:37:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:36594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730704AbgEANha (ORCPT ); Fri, 1 May 2020 09:37:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34F7024953; Fri, 1 May 2020 13:37:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588340249; bh=21jnwet0trPW2Kv3E6ihRnckW6TR5od8KkJAPHwPeqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T/u/k+BlKCXwgMdzKiz/2GtDmsF6atN3Xuu8g1HJDdwvGXGwxMCi7nPjA5Trn1/vW WPe69Gnj2lAJc2mr9R3hygH769MWVX7id8UK/DhJFjm0bBxAwYZ7Pg+0Ds43JTzFuW YoDaiRq00oaY2/jIAWDZIe36A/8b69gz5+X6wkEo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Theodore Tso , Sasha Levin Subject: [PATCH 4.19 41/46] ext4: increase wait time needed before reuse of deleted inode numbers Date: Fri, 1 May 2020 15:23:06 +0200 Message-Id: <20200501131513.092895370@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131457.023036302@linuxfoundation.org> References: <20200501131457.023036302@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 dafa7e4aaecb9..8876eaad10f68 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -665,7 +665,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