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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA110C0015E for ; Fri, 16 Jun 2023 10:37:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345325AbjFPKh3 (ORCPT ); Fri, 16 Jun 2023 06:37:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345205AbjFPKeO (ORCPT ); Fri, 16 Jun 2023 06:34:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9DFE468E; Fri, 16 Jun 2023 03:28:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C258D636EE; Fri, 16 Jun 2023 10:28:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C8AEC433C0; Fri, 16 Jun 2023 10:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686911319; bh=YVgJO37I3EgOmZmGI7Zc9twjOxg7krpsbaAAJsiurHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MCRWA68k5/9RgeF/KV7psskHokDE0jJRF8ekRxlFdZxRav+z/zTssc3Erw3VCck4R 3F3ka0AYnTyDIG4jMLsx0XsvHf3qSr+S0HStfzKf59k+BB8FpapBO0eXSVmwfz0k97 y107BZUmFU0eMKfpjTpKW9esJhY4wQ4krv8KF+D8oqCR2/Lz+z5DvyJVuHCmrFtuTL yacjPK8NK11hd5gIw6DvgA5pSKTYMfV9qR38HVTbos/RFhOsFGG2n7veinWmylfC3y Wb7+t/CGPp4F+REpu1PNC2EvT678eqsVJMAi5NZ9Ipv8B6e0WSoPUddVGH2C2pyYcx KyZ9onlwvi6hQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 8/8] ext4: only check dquot_initialize_needed() when debugging Date: Fri, 16 Jun 2023 06:28:21 -0400 Message-Id: <20230616102821.674153-8-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616102821.674153-1-sashal@kernel.org> References: <20230616102821.674153-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.247 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Theodore Ts'o [ Upstream commit dea9d8f7643fab07bf89a1155f1f94f37d096a5e ] ext4_xattr_block_set() relies on its caller to call dquot_initialize() on the inode. To assure that this has happened there are WARN_ON checks. Unfortunately, this is subject to false positives if there is an antagonist thread which is flipping the file system at high rates between r/o and rw. So only do the check if EXT4_XATTR_DEBUG is enabled. Link: https://lore.kernel.org/r/20230608044056.GA1418535@mit.edu Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/xattr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 3440cddb5ffb8..79d13811c5be2 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -2016,8 +2016,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, else { u32 ref; +#ifdef EXT4_XATTR_DEBUG WARN_ON_ONCE(dquot_initialize_needed(inode)); - +#endif /* The old block is released after updating the inode. */ error = dquot_alloc_block(inode, @@ -2079,8 +2080,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, /* We need to allocate a new block */ ext4_fsblk_t goal, block; +#ifdef EXT4_XATTR_DEBUG WARN_ON_ONCE(dquot_initialize_needed(inode)); - +#endif goal = ext4_group_first_block_no(sb, EXT4_I(inode)->i_block_group); block = ext4_new_meta_blocks(handle, inode, goal, 0, -- 2.39.2