From patchwork Sun Dec 15 05:12:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 13908662 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) (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 677239450 for ; Sun, 15 Dec 2024 05:12:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=18.9.28.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734239573; cv=none; b=dVk3ImMCh71d9IyQayg/EOqmGIjcR18aFAThDVCw4bVxNsg11X4PMtTUibp9RsxNNeuJDtl4LjKhjbjjNZD7FLHvFKGyT8dT5wygnwJ9O1rq/Rd+wDeCegcNEKWVZlR3zGX5LnGUup01WCZ8eQtebUREuP7VbR18CoHEpIPo1e4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734239573; c=relaxed/simple; bh=UV7DP3/rkim2gIJG5rzeZ27iqYxV/z/+FDZmynz3IBA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IL0Oq7g4/LuEll6cMlk/SNT+3s4meZKeam/BT1kSQmMcBQNqQmTnmV6n2QJhFhiqgCYpFB4WhbgeLkJWzBJTJ+tDTRSYbITDetL2QQtrqEJGWPpriRrgZ7RBbyHXqpoi3wVNj7MXMhifFfos0XIN6laGBEMs+a22TLuz6W1eYRU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mit.edu; spf=pass smtp.mailfrom=mit.edu; dkim=pass (2048-bit key) header.d=mit.edu header.i=@mit.edu header.b=i5vTt4M7; arc=none smtp.client-ip=18.9.28.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mit.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mit.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mit.edu header.i=@mit.edu header.b="i5vTt4M7" Received: from cwcc.thunk.org (pool-173-48-82-226.bstnma.fios.verizon.net [173.48.82.226]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 4BF5Ckwk016317 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 15 Dec 2024 00:12:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mit.edu; s=outgoing; t=1734239567; bh=3j2Z8iw2rO+eZLaywIqn8SZcjLivo0CXS/EClIwCa4s=; h=From:Subject:Date:Message-ID:MIME-Version; b=i5vTt4M7apFbh/MjLSw7Bjl5nU8Z1+e7m0Mtz86Jiv5ilKrLqsmMle8Rvj8yYn0u2 lZYECE6oQ1vFF+hf0s1imhEnLDoRZNBIacHqUv8Fjy3ibN15edTiDtqPQJPfWbjZWe FAi7IEtTdSc0Czl3tz0HXHehlK7t5KB4Tmg7qIv/CEgRZ7gp4nQi7BgNMMZcIHe46g mkYKqSn/AaDrKxiqYsRMZiKMqOTpjpZrpiuPA1JVvWnyqaCbJ1ItIntMSmGslqqGhd IwzTCt41RDhL7f2mXwwq8D9vXmhKIJHZw2GX5Ytt2ga1r7lkuCIhdDixm0tkg3rRhq q17N7gzU8d0mw== Received: by cwcc.thunk.org (Postfix, from userid 15806) id D7ADF15C465A; Sun, 15 Dec 2024 00:12:45 -0500 (EST) From: "Theodore Ts'o" To: fstests@vger.kernel.org Cc: Dave Chinner , "Theodore Ts'o" Subject: [PATCH 1/2] generic/135: don't try to rm $SCRATCH_MNT/* Date: Sun, 15 Dec 2024 00:12:41 -0500 Message-ID: <20241215051242.3340572-2-tytso@mit.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241215051242.3340572-1-tytso@mit.edu> References: <20241215051242.3340572-1-tytso@mit.edu> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This fixes a regression for ext4 introduced by commit 32e14cb90b88 ("fstests: don't use directory stacks"), which replaced a number of files at the top-level of the scratch file system: async_file sync_file direct_file trunc_file with "rm $SCRATCH_MNT/*". This causes a test failure on ext4 file systems caused by a failed attempt to unlink the lost+found directory. The thing, is these files are all super small (4k or 16k) and the scratch file system is going to get reformatted before it gets used again. So just dropping the delete is the simplest way to solve the problem. Fixes: 32e14cb90b88 ("fstests: don't use directory stacks") Signed-off-by: Theodore Ts'o Reviewed-by: Christoph Hellwig --- tests/generic/135 | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/generic/135 b/tests/generic/135 index 392fee6fc..f74e144f3 100755 --- a/tests/generic/135 +++ b/tests/generic/135 @@ -40,7 +40,5 @@ od -Ad -x $SCRATCH_MNT/sync_file od -Ad -x $SCRATCH_MNT/direct_file od -Ad -x $SCRATCH_MNT/trunc_file -rm -f $SCRATCH_MNT/* - status=0 exit From patchwork Sun Dec 15 05:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 13908664 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) (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 EA97C14A90 for ; Sun, 15 Dec 2024 05:12:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=18.9.28.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734239573; cv=none; b=aXZlKrMJpctbvmbo3APB6xqJIEYqt03li2up39VZra8XLv/bYLLS8PPuuFu3lEC3L8HJU8woFLQk4AmbLQiJ7Jfs/R3kqvhyFylCuYKgwtaWU4bKOYV/3AXj4H/8XGOeKlIJQ5S9dtVXT3otJaGpKJ0nHbIpVcHqW4VfYLzlZow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734239573; c=relaxed/simple; bh=NqV45Q3MI7QE+DdrecnG4mSoaq1MeTySo5Fw2cH4OiI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d7V9E3IX9I5nZgjOKz5vSAyrf2vc9xULU/S/MQ3MZkSInqiOtyZw03hx6Zs1IYaHwBmxavR6wa4sskkoKJ/1beiFSKkHPy11uiUIBYjObbIE3OJNAb2dXNuGgkjfFozQiRE3vdauQmouY9EI3DpGRka73tjTjhRHzIYNT/2EJr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mit.edu; spf=pass smtp.mailfrom=mit.edu; dkim=pass (2048-bit key) header.d=mit.edu header.i=@mit.edu header.b=aN46evF5; arc=none smtp.client-ip=18.9.28.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mit.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mit.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mit.edu header.i=@mit.edu header.b="aN46evF5" Received: from cwcc.thunk.org (pool-173-48-82-226.bstnma.fios.verizon.net [173.48.82.226]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 4BF5CkOK016315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 15 Dec 2024 00:12:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mit.edu; s=outgoing; t=1734239567; bh=HPdy6WfKUXiQn+osnD2FHdJSwH00wfd9S2ZaVh4a6NU=; h=From:Subject:Date:Message-ID:MIME-Version; b=aN46evF5IKYu9hQ9ecehnJ2uTEho4KrnUlGNl8uEDvebwim6BdtQTlu6esivLrIi+ BRH+HipUzx0MPdvlI9dJackiYuU3pe4SiqTKFwIYlXVPZ3PS3myftGaExq357KAZVa F5VwPWP1GoIfvsD4Zk6y2PE4Wywl9qiFGC4fv/87pgINaugHNrDf1sBwETk49abbhO xmoECppK329gdoGF62Xb3u2gZRIrjv8yrvfvc768hmWTmf6Phlt9hjWb/zMOo5LxWF BYFCNHRDU8XWp4dflhcKIFmCMwsQXEz07VCNhlnpltGxSp26VdhhmcSYT30Rr3J35o NH8NgA5/8yZVA== Received: by cwcc.thunk.org (Postfix, from userid 15806) id DAB2715C465C; Sun, 15 Dec 2024 00:12:45 -0500 (EST) From: "Theodore Ts'o" To: fstests@vger.kernel.org Cc: Dave Chinner , "Theodore Ts'o" Subject: [PATCH 2/2] generic/530: only use xfs-specific mkfs options when testing on xfs Date: Sun, 15 Dec 2024 00:12:42 -0500 Message-ID: <20241215051242.3340572-3-tytso@mit.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241215051242.3340572-1-tytso@mit.edu> References: <20241215051242.3340572-1-tytso@mit.edu> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This fixes a regression introduced by commit 000813899afb ("fstests: scale some tests for high CPU count sanity") where this test unconditionally tried to use the mkfs option "-l size=256m" which would break when testing any file sytem other than xfs. Fix this the same way commit 000813899afb dealt with this for generic/531; so this was just an oversight. Fixes: 000813899afb ("fstests: scale some tests for high CPU count sanity") Signed-off-by: Theodore Ts'o --- tests/generic/530 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/generic/530 b/tests/generic/530 index 18256b870..06d7532f0 100755 --- a/tests/generic/530 +++ b/tests/generic/530 @@ -22,7 +22,11 @@ _require_scratch_shutdown _require_metadata_journaling _require_test_program "t_open_tmpfiles" -_scratch_mkfs "-l size=256m" >> $seqres.full 2>&1 +if [ $FSTYP = "xfs" ]; then + _scratch_mkfs "-l size=256m" >> $seqres.full 2>&1 +else + _scratch_mkfs >> $seqres.full 2>&1 +fi _scratch_mount # Set ULIMIT_NOFILE to min(file-max / 2, 50000 files per LOAD_FACTOR)