From patchwork Tue Apr 1 06:43:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nirjhar Roy (IBM)" X-Patchwork-Id: 14034400 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09CD21DF73B; Tue, 1 Apr 2025 06:44:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489878; cv=none; b=oi9oMTyOZkuElANOIRp3ukegKs+ZwyQsg8vIpnSOVR4hpy8+KTpQZbHfTO2YLRb/IPWX4zuJFyRlgRuxvERG1KTiJ2FlzoMgHPF1shmdZiUMxbFw4sl4tx+699E2ThR8LzvA3VhTenXPJst0NfBS6QJwfrIvIOjMwi8ImO3/Uy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489878; c=relaxed/simple; bh=Zc2lEsr27B0s6xfSJ9zT2sLdqBUheLY4WYlW6feyMCY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qeqI67OlLi9WsaxGUFCNJQo3/Er7KmVA4aoHn6Zduq1TYHiZjXhh5LdkPw/MSSgmYEl1nFdLguJq8aMO4bwqRW8l0HjQv+Nd1IO9BADorR7qtwwU2ykF8dMegy6o1w87+s3C5b5pOU0NN1mjT/LeQ1UlBe4qJNLVqnMoVFBrN7o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aZ0r13/m; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aZ0r13/m" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2254e0b4b79so134188615ad.2; Mon, 31 Mar 2025 23:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743489876; x=1744094676; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rc5zDzVBybYJrZbMg8VUhGDJ6JU0cBSoCKd7IYNgcso=; b=aZ0r13/mzG9BEgyvbx4ZV28AIoPFUWeVZCgTxHjwTPb2Q9nCi9qPigX+oYs9dii9O5 gZjQmVKEr772tccgdg2N+jaVGteJ4Dk8/ghRjKw9GB7SBB69GHwi3Uz7i83LrSHBGmTN MVWl5S7PachKCkIRU77bIEYoVws4x2XgF7SpYdmgYFxWyJRbPnBTdlVvdXl+XkdnKDsw V91wP3Rt17M7fXq73emRgXmcOzzVd0IJ0Wo4NrAAwA+OK3yRPVNUSszT5GHLfjpo82Ib Gl33XG2qCMuOteVQx+0EMtCqv09jjWfPJ+F4GdB34K9aqIZjA4KU27iWJDiITu7y3SwV 3iNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743489876; x=1744094676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rc5zDzVBybYJrZbMg8VUhGDJ6JU0cBSoCKd7IYNgcso=; b=HlGaWNTstmcslxLb2BnJA7IGyrHO7KBvA3QobWzV/zg/O48DbXsIkIyLO3MHEaBRgF KztQJITYOPveHB7HVc2q6bdofBr7qhquz+5NkNOvXEHkUcz+MqdJ1sivBZi0BzoT/gwq /gVIugXxuxf/LHtGgWs9P/WugIIvys6BmclV7jq914cpiogaVfHqaogOX0iYRw4q8+0O zwX1z/j8RUuBJk+vJlMklnpULOvPM6aDVPoFKEwCGJmJI17liY9lnvK3qTQbjdmhyBMB 6pIajwEk7WSXDWFvV/98K4HI2qV5ttZ2ABPyntjgd4S4BDoF087FJJj5c2nkqKQ7M79+ UAwQ== X-Forwarded-Encrypted: i=1; AJvYcCUj5EmnRuBCvvZX5/Poympx09qDMztzR1G51gfJcsKGxrRadi5VzYrVLUsj5IPRNYUHbUhHMBizsIk=@vger.kernel.org X-Gm-Message-State: AOJu0YyuE2H0pVtje8JK50HaKco1VSLsukK4lewMDPGNdVJb6BoO5YBo 0OZoMutdg+Yg31fd42lN+I4imrewH8+heM7mGsWG40j1dvs+otKMvHUGdMO7 X-Gm-Gg: ASbGncusoLxzaniPpfve7Lk2eh+IjV3+ROYFqFyglm9ihhhx823nOTRwWeURDO6FSFq JKsLzgqgCtllNkODk8R9wEjIvGPcFPP+tYNgSO+hbZf4TwfqspQPmsPnF7R5vI5/Bes9KdSm4+2 nmTayGkXjD5fn07xy31GlWhCGOIqY25/WnMKKh8VvtEFvib0vi9P1Pw+qPvtwtZ7peTi92sMwVt hm1V0Xx9PGyl0rx4BL1lX9UXvNBwjP9GdrfBv7gQVNxeT90jCpHMIUU++zuiqc530IeLfqr0LhD 5wrfecDnhfwmgYfSSNLrWS7ZKyP++icq9SP4S6Zfok+aI8Dg X-Google-Smtp-Source: AGHT+IF95FmwcX+babgcTjOMfwHmkuCGnrRxZM+DU3T6zWwpJLWT21a+j7O79gbPY3KGl3BfLneP3w== X-Received: by 2002:a05:6a00:b8c:b0:732:a24:7354 with SMTP id d2e1a72fcca58-7398033f3ecmr18547208b3a.4.1743489875995; Mon, 31 Mar 2025 23:44:35 -0700 (PDT) Received: from citest-1.. ([49.205.34.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7397106ae4asm8135092b3a.110.2025.03.31.23.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Mar 2025 23:44:35 -0700 (PDT) From: "Nirjhar Roy (IBM)" To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, ritesh.list@gmail.com, ojaswin@linux.ibm.com, djwong@kernel.org, zlang@kernel.org, david@fromorbit.com, nirjhar.roy.lists@gmail.com Subject: [PATCH v2 1/5] generic/749: Remove redundant sourcing of common/rc Date: Tue, 1 Apr 2025 06:43:56 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 common/rc is already sourced before the test starts running in _begin_fstest() preamble. Signed-off-by: Nirjhar Roy (IBM) Reviewed-by: "Darrick J. Wong" --- tests/generic/749 | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/generic/749 b/tests/generic/749 index fc747738..451f283e 100755 --- a/tests/generic/749 +++ b/tests/generic/749 @@ -15,7 +15,6 @@ # boundary and ensures we get a SIGBUS if we write to data beyond the system # page size even if the block size is greater than the system page size. . ./common/preamble -. ./common/rc _begin_fstest auto quick prealloc # Import common functions. From patchwork Tue Apr 1 06:43:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nirjhar Roy (IBM)" X-Patchwork-Id: 14034401 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 637A91E47B3; Tue, 1 Apr 2025 06:44:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489892; cv=none; b=l5U0S6EWdru8tAQpKVlfsdtkMdh5m6kVmamFHmgnHolKOJpCr06jFxVMMrddZUiPZ4jVYjk1AblQC5KjNzuvMDUIccrE0u+R7COHw4f3ZpkSx0+3LDzugy8rUFTGH9AnzGDdcLV+h2ynYG19nkMKxFty63IHt4spCluqIvY3gG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489892; c=relaxed/simple; bh=hHAXCr3nq/lhsa1DoZDQ/S+rYmxL90t2z0GRovewTKc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q6mTKQB2fYeZgIWocKvbqyTt1ml8mxyRFreKyL+6CFQxnY5lXhzaVPvNCkmfWRCdDpnO4d8b4ndH3kWOFvBuCxApoLIsxA+pnua5x9omqYd4uoDlCZQAT1GIOn0na1wLw1jFk+z36EbDVMKRodQxmYEnluHgTo9FepqvLfFEBw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QEWqXpSZ; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QEWqXpSZ" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2260c915749so71752045ad.3; Mon, 31 Mar 2025 23:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743489890; x=1744094690; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h7sAmGKH3P+AHVXMJy/ZUH5KzmfRVUy+dv7rxoyM00A=; b=QEWqXpSZZkGfHye05a/x6B7+vctC89tjHnO0zvt4Fy37LhYFoFcnIFyfIM5c9YUXqw PLhszAhCsG4IJ+dIdb4OAUmuWZXUHGXNeoWCpkhaEsA9EKmqbn0Uc9q6g/l3mj0dc/J+ gkAJqApi7Z1uU6YqDBgCBit2ykL1D4igRPDZu0l0HEfIynNcJnXlgir5e80I34S3YTj2 5bUfBV7zvpyKyPb3AM0s/i03gIg1jsjo2+o0vq21nAm2Bj2nabL7MAY+Jw1u1SXJqGxX XYyx5GcGBkvHzd61QsyE9hTGo/3hv6KBXCmWODkUvh3H5lXNp2ZfRMSkO40CM8jvptVo Fi9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743489890; x=1744094690; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h7sAmGKH3P+AHVXMJy/ZUH5KzmfRVUy+dv7rxoyM00A=; b=sLzqkSAZ1UnGYP2dioq/XbD5Cb9B0lO8HUPKqamP8CE0DbJCS2pvXlDbU554hEm9LO UD93fk6o4ELRMEovbA/gptneFWksNqtfjtALjiYB++lKBVY3WQ2OqZThrZbykLEqGMy3 FMrsoD5aJiZsHuTLPusmp5r5AcR1CFNv5Qf9R+1n6Vdnr9JIzIKsPWX0twE0tGsXUejz /68WeTowMrSN9+Bw8Nb00aH0QLgYXuf/QKLx+Nw0ffktC64kuuz3aOkQhKdDXXkPoE3z yrUtFAWRGTuaFrUE49G5bXFvFospI7679u8N6Qz9AwO99BYvLw7Wf+Wyv3d90WkkGbU0 S57Q== X-Forwarded-Encrypted: i=1; AJvYcCXiClLhPUvyx/0emRdI8TVJ8OGWAJ31tVAyly7EksNYaT+xZXd4sq9EOLfHkhxkZ4ey0FBzRtVZF3g=@vger.kernel.org X-Gm-Message-State: AOJu0YwygP/ECwwzreaTX89HmqJXH4wjdeEYIP62iDNh16XG6DGHov13 yYpHdeeSNPMmSWXNHKv6CxSH3LZPIHG53XFGCpVV7pMceqtIOS1WaHTuUybr X-Gm-Gg: ASbGnctyKo7sgt6j7m31JgMPZiHI1s+eMezbiLleQDdZKAQNwlPzDZa1NFcBsoo+P5q NXvMP+4HkO/4c0UjOFTd7pcqsvgo0+ot27bdwGyEBczOCPN2tYirLReGj1tuczk2JbFNO326nQP kU0RwOFWOYa548VIB8HW682cyxXxrhqYyacBSSeDw9i7HXq43oPQFaC3dOX/eGtHwmxRAFTZlUD FZQW9+T6zCj9AJQwX8jw9qwCHsTjpim+UksJqlMkvS1ppV7MS2ic9tRK2h9Q/Kvt+E59v9U2c55 /EFfkqYQFOemz45GvcrXUv0jI+olHU3Q7LaQf85NcpnBjBCz X-Google-Smtp-Source: AGHT+IGScYx34WO+qxCOJqwNZieE94iQGH93k7EpL2EmyUq8P1eB+SmrKJQ/E7cVJAqCRv+WIjaCbA== X-Received: by 2002:a05:6a00:1412:b0:736:3fa8:cf7b with SMTP id d2e1a72fcca58-739803bc866mr14833352b3a.13.1743489890215; Mon, 31 Mar 2025 23:44:50 -0700 (PDT) Received: from citest-1.. ([49.205.34.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7397106ae4asm8135092b3a.110.2025.03.31.23.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Mar 2025 23:44:49 -0700 (PDT) From: "Nirjhar Roy (IBM)" To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, ritesh.list@gmail.com, ojaswin@linux.ibm.com, djwong@kernel.org, zlang@kernel.org, david@fromorbit.com, nirjhar.roy.lists@gmail.com Subject: [PATCH v2 2/5] check: Remove redundant _test_mount in check Date: Tue, 1 Apr 2025 06:43:57 +0000 Message-Id: <6a8a7c590e9631c0bc6499e9d2986a6d638c582a.1743487913.git.nirjhar.roy.lists@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 init_rc already does a _test_mount. Hence removing the additional _test_mount call when OLD_TEST_FS_MOUNT_OPTS != TEST_FS_MOUNT_OPTS. Signed-off-by: Nirjhar Roy (IBM) --- check | 6 ------ 1 file changed, 6 deletions(-) diff --git a/check b/check index 32890470..16bf1586 100755 --- a/check +++ b/check @@ -792,12 +792,6 @@ function run_section() _prepare_test_list elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then _test_unmount 2> /dev/null - if ! _test_mount - then - echo "check: failed to mount $TEST_DEV on $TEST_DIR" - status=1 - exit - fi fi init_rc From patchwork Tue Apr 1 06:43:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nirjhar Roy (IBM)" X-Patchwork-Id: 14034402 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAC921E378C; Tue, 1 Apr 2025 06:45:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489907; cv=none; b=dpD6n+94s1JdmoycOW4NxagpqJoFZC3tivLpXwakEwyIJdNTM6Ak35h6JA9pWMCCPTVp8Vi1vEh4/FQB9NWTirYuNju/WRofrfSzCq8hUaet84cKlSnQJq0wa0UufuynGt1bMYMMXYhEq6UduLLwZmR8Ff1iYKEVSAxDKa7j3r8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489907; c=relaxed/simple; bh=lkKHWmNIdUANkalyX7UzElc1YsT4NlD/u6aSaUSHckQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EE/Z0eEw9CfA6GH5hjIh3OoSbig/urAekAkI/cR9UPlsrNzXLrxZjssKbvxtOd8tYud5+ngZsk56uj08ntZ4ZYriZp7uqCJMnXdDcCpNJOne8bKb3PHc/ED76DD5OVHyMZ3u1+jjFsUiHS6M1/8XKXGp+JppwrQNhYks7fuWx3U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KhJ+hBWj; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KhJ+hBWj" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-225df540edcso114590145ad.0; Mon, 31 Mar 2025 23:45:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743489904; x=1744094704; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nWkClC32TOX/KRE7kH0VGIztpLwpRoczq5FgEMQ37aI=; b=KhJ+hBWjr+3qPNe9nGdhFOrSgHJDtWgsSqkUDYB1cNc/RlQja5HdyMBkgUMxKSlqzn KBjPZUFBrGp1qrfD6IdV+EnFpqxLOR6H7k2W2/iaGrBEHr17VL8Cb7b0p8iEIbWwzDaB 6q+8TQfjnAv77r5NiSixG+EPcrCsZBfuknvusGL1BpRzfXe1HI28xjcmivG7zp5/GY0/ BaipvjXdX/0qUtBwyabn3JfNDR9D8Wxhx/Ur2rtrpw7KOOmGU0C6cgM0VObq4gTAD8SM 9HfWbz0ffnK+mtqAvz9aKWOBtMgw9cRN8GTJXevMZz6UFjbzhWOPmffEVyhaQIzEmvU8 ufTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743489904; x=1744094704; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nWkClC32TOX/KRE7kH0VGIztpLwpRoczq5FgEMQ37aI=; b=gRd/9zeBzbS34BCpqKxAEKXMkBBPS3+W3LyiFBDj1OcX5xQtlWROQGjvnFxtAgo92w s87xDJRnmjUXJLevPXoKgYAzPmts9oFUtIueKP5I4+FKXFrYHemuCAOt+rirCGMBvIys TlKBBei28P2qk7HuRTAzLpYdik0l3aibQqvhePwIAM9eqDkALFD2fkrJPaPJXVeCQHY7 PnxkbbjbrCfAcykquyCca7eXq8P7le5Haj/gN0i06AszOUPBgme6KyLXfFfgOBUZ7jiQ JgFR+mzfoQUFY0R3t7amay67yjWwtk4K7ii077pDEsEG57dvBTRndDsZghD18LyFo2HW anLQ== X-Forwarded-Encrypted: i=1; AJvYcCUF74MI9/u3jmrdh9bEC2O1pxISsBiTSDHd7jlVZ5XUxqFkaBmzPEhwNKHpTLgETCR77zfLUVHbKu0=@vger.kernel.org X-Gm-Message-State: AOJu0YxVl2QFXfjeqi+vxGZvExDLH4ULGVsAd6WxF5K989TPfANQncoc f9TzcV5RcJvTJy4hgoRHKep+rQcWaDagHqkf4WG50qKgfI/Tt40JZG3e0K3m X-Gm-Gg: ASbGncsh4z2E5I34rQ+u7B96Bm4hHZuIlGJ2wlu19wMLeiIUNKJVAYZiJaSPOJ5Qj4m KxmMX3QowCNv96fhm43ovNtjL5H6oB/IncmiRigc1ri5V56gLkv6CTi4c93mhjt1X9IzQfMDlOv FxwSI633vHncl8nC49GYSqXz8oPjZbKZw9x+aEMQCTIKkjVEnwAC1rEnVUCLr/Fe0AKr4WqOL6p TKvjFXkQXQjS5HDKzzsH3DQP/bGEr6FkkMPNiL9cqh/nqdAEU0xZRGcKtj6G1XFsKIMqTQnx7df uXId8g5lsTVWA3r/NQHb1Pg/sTHGQelED7I2BOwktD3MbesC X-Google-Smtp-Source: AGHT+IFFBfWrnHhHopyna0tpGEXTdQuyLx9fl2iioEWifwHL2E+e+qr3gFnpoHAc1m1+aCsVwUL4Bg== X-Received: by 2002:a05:6a00:a26:b0:736:4e14:8ec5 with SMTP id d2e1a72fcca58-7397f4c421emr16634585b3a.11.1743489904133; Mon, 31 Mar 2025 23:45:04 -0700 (PDT) Received: from citest-1.. ([49.205.34.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7397106ae4asm8135092b3a.110.2025.03.31.23.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Mar 2025 23:45:03 -0700 (PDT) From: "Nirjhar Roy (IBM)" To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, ritesh.list@gmail.com, ojaswin@linux.ibm.com, djwong@kernel.org, zlang@kernel.org, david@fromorbit.com, nirjhar.roy.lists@gmail.com Subject: [PATCH v2 3/5] check,common{rc,preamble}: Decouple init_rc() call from sourcing common/rc Date: Tue, 1 Apr 2025 06:43:58 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Silently executing scripts during sourcing common/rc isn't good practice and also causes unnecessary script execution. Decouple init_rc() call and call init_rc() explicitly where required. Signed-off-by: Nirjhar Roy (IBM) --- check | 2 ++ common/preamble | 1 + common/rc | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/check b/check index 16bf1586..2d2c82ac 100755 --- a/check +++ b/check @@ -364,6 +364,8 @@ if ! . ./common/rc; then exit 1 fi +init_rc + # If the test config specified a soak test duration, see if there are any # unit suffixes that need converting to an integer seconds count. if [ -n "$SOAK_DURATION" ]; then diff --git a/common/preamble b/common/preamble index 0c9ee2e0..c92e55bb 100644 --- a/common/preamble +++ b/common/preamble @@ -50,6 +50,7 @@ _begin_fstest() _register_cleanup _cleanup . ./common/rc + init_rc # remove previous $seqres.full before test rm -f $seqres.full $seqres.hints diff --git a/common/rc b/common/rc index 16d627e1..038c22f6 100644 --- a/common/rc +++ b/common/rc @@ -5817,8 +5817,6 @@ _require_program() { _have_program "$1" || _notrun "$tag required" } -init_rc - ################################################################################ # make sure this script returns success /bin/true From patchwork Tue Apr 1 06:43:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nirjhar Roy (IBM)" X-Patchwork-Id: 14034403 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FAE74D599; Tue, 1 Apr 2025 06:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489917; cv=none; b=ZSss/GYXaAykhYEY4dH4E0IH7Qp8qD3z57fHupfh3y8mN5cht2FhhYy3C/HCu4/tFdiJlM5YW23H5qbnFuJTfZyIq9kTJcU+WUQ9LknoG/u3YXgKEno7IFa9efy44lv0ipsAKiQLzdM6v81j2tI5c86Cao2eBy7m5vf91TvvNhE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489917; c=relaxed/simple; bh=jMGCpMeYgueXGodMZgt5uAMcpsuZuTOcSYUQwJvFoig=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hspHaYDZK8SodJZcn1+gEeU9F/Y9sYoXvP9RSHR2NIc89CQ4OrOdeRRPAG5I1feVjjFEQfxSFiFO4hSOcDbjNEOuOJSy4VAXuoFxgvklPsDYmMo/Nswk9Y1xmjJoXS6MWrioScFlaBHWgTKi3YPEVOVDQ4kua6i3wVp3OvBz4CM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ls0hnRSB; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ls0hnRSB" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-22438c356c8so101665275ad.1; Mon, 31 Mar 2025 23:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743489914; x=1744094714; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C+RCkWUSMjxNmaTFzdQsP3/hq4/SoQWwDMZZ/WKYtRA=; b=ls0hnRSBeUZMyXjlMJ/PBofEWCUns4ExgdMiGzBjmCfATnF+hNoxu4UZh4jRCnYyqU +hBUpFnhSoXuSsRorZ+Mi8olaj87m+idtRLVGTMXXNZZx1IhXPtuf7TYDOb2tRFdUpAI CRgsdzbVJjgGXCJyr+H5fc0MYJIltGjVn1/Mg6tlue+dLOgr0V7EIzOocMutGaYmKZeM y+R5QGUI9FpN0ZwU2iS2TKu3vscrIMKZJ3EtCBFu2/Nm9pNCWGLQ768N/PPi+PWUTRs2 cLA5D+yHwxRTnTh1aXK7RriIy775ef3dHG26OUDxeeOAka/8q7HnejvffrlPZHaYwD/7 Tj6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743489914; x=1744094714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C+RCkWUSMjxNmaTFzdQsP3/hq4/SoQWwDMZZ/WKYtRA=; b=foR7rtrB+vxxJ8aQc+VOJTY2FcmaN6eL3w2zMzi09w80VO6IXINVQHXNAxho+z+WC7 RCfHXLMzbf6PGCn1l4c32XCAFcnYo6keHvIpzLHQgUMITJYtlUJZ8wqJMXTcC0Rkfm8y P9zR73k/G+1HwWRw5GrzwtZgpjEArZYTFST3+czSaLOr/iQtunHbyET+R1/oDbLAAyZI IXCVsAT5rj4NRB+vLzIoL1zTVewW2xfMG4gL2eXf2XrsQzYycake/tUMNqkyW0t0jq+f 5T7y7ZQugDVQnM0M6DLuESUYIRBqvoKATYjI7RMe/KrY4Z4ujrY9JsCBy/nDz8s0Wc9z BRFw== X-Forwarded-Encrypted: i=1; AJvYcCVCnc2oh2fakv7lGh7um0Lw+jfXekpaRnKe2PXihyrUQ9flVXwTMxxnU3d+Jp15qR39PByd1zXz9KY=@vger.kernel.org X-Gm-Message-State: AOJu0YyC61BHLstjrSBbg7IpL4RAcbQBBMjb3O31ASTWT1nG3UvJFiyx ZCLDDW50LJDI0VIhsa5iulIlMzpdOPEI8WEvHbqzD/L79e9r7TWYnhuXgVoH X-Gm-Gg: ASbGnctV0Wbyewn4pXLIeqLL2Kt1Qr5BJHulJjz55gSGmzVpO/CKYkzKQzhQuCiE9s+ rkie4NZhsEtGq2N6yBwz7d6FRqWO5nME2ZZJk8InWHFTuJnmE8KAZzOdDzvf3OPHNYTK0lb5MtB wgWscTknivL1hJ/N/yRaHR5O5hNV/YJPGPJw6h/2e7m3MOHKmE4jcGTHz5VBX2A7cQycjKBMu5J //zohEIGsxrbliqXajeGzNR+LRE1PtVJ/BH/Tn4494Yt/ffxAYe8lC0e6VsrdVBzoFwfVwrPX6Z qPWgM/F73BKHZ/PxrjkhoyuWv7prblXIFKjpCjZ2V0HPNLo5 X-Google-Smtp-Source: AGHT+IHjkQCCQZdsjtZa2xCgFAeNEtTZL/bdP1koTdN6JTpYL0KGOxQLFSZcL1Itfow76XHx2TDdAw== X-Received: by 2002:a05:6a20:cf84:b0:1f5:7f56:a649 with SMTP id adf61e73a8af0-2009f604630mr21636843637.13.1743489914452; Mon, 31 Mar 2025 23:45:14 -0700 (PDT) Received: from citest-1.. ([49.205.34.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7397106ae4asm8135092b3a.110.2025.03.31.23.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Mar 2025 23:45:14 -0700 (PDT) From: "Nirjhar Roy (IBM)" To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, ritesh.list@gmail.com, ojaswin@linux.ibm.com, djwong@kernel.org, zlang@kernel.org, david@fromorbit.com, nirjhar.roy.lists@gmail.com Subject: [PATCH v2 4/5] common/config: Introduce _exit wrapper around exit command Date: Tue, 1 Apr 2025 06:43:59 +0000 Message-Id: <80bb7e56ff00101c6bad6c882da631a20b09b6ad.1743487913.git.nirjhar.roy.lists@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We should always set the value of status correctly when we are exiting. Else, "$?" might not give us the correct value. If we see the following trap handler registration in the check script: if $OPTIONS_HAVE_SECTIONS; then trap "_kill_seq; _summary; exit \$status" 0 1 2 3 15 else trap "_kill_seq; _wrapup; exit \$status" 0 1 2 3 15 fi So, "exit 1" will exit the check script without setting the correct return value. I ran with the following local.config file: [xfs_4k_valid] FSTYP=xfs TEST_DEV=/dev/loop0 TEST_DIR=/mnt1/test SCRATCH_DEV=/dev/loop1 SCRATCH_MNT=/mnt1/scratch [xfs_4k_invalid] FSTYP=xfs TEST_DEV=/dev/loop0 TEST_DIR=/mnt1/invalid_dir SCRATCH_DEV=/dev/loop1 SCRATCH_MNT=/mnt1/scratch This caused the init_rc() to catch the case of invalid _test_mount options. Although the check script correctly failed during the execution of the "xfs_4k_invalid" section, the return value was 0, i.e "echo $?" returned 0. This is because init_rc exits with "exit 1" without correctly setting the value of "status". IMO, the correct behavior should have been that "$?" should have been non-zero. The next patch will replace exit with _exit. Signed-off-by: Nirjhar Roy (IBM) --- common/config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/config b/common/config index 79bec87f..eb6af35a 100644 --- a/common/config +++ b/common/config @@ -96,6 +96,14 @@ export LOCAL_CONFIGURE_OPTIONS=${LOCAL_CONFIGURE_OPTIONS:=--enable-readline=yes} export RECREATE_TEST_DEV=${RECREATE_TEST_DEV:=false} +# This functions sets the exit code to status and then exits. Don't use +# exit directly, as it might not set the value of "status" correctly. +_exit() +{ + status="$1" + exit "$status" +} + # Handle mkfs.$fstyp which does (or does not) require -f to overwrite set_mkfs_prog_path_with_opts() { From patchwork Tue Apr 1 06:44:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nirjhar Roy (IBM)" X-Patchwork-Id: 14034404 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B40384D599; Tue, 1 Apr 2025 06:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489925; cv=none; b=ibSIbA64mvwt8e5tfwhnUTiXLNsTkHReTaYea2rRdJVK9mm4HLNIVkvne6cGPqbz74os0iAaxbKW3HoNuEXfRGXloNHWYeBYWOaGWS5RIc2k+AxN7rejrSk6Qi+fe9gMe5vNKfExf9nX8ZChgxSSSOIKrdeCfxLMeKEPBzRCVnk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489925; c=relaxed/simple; bh=R6IwBnIqnFmIIfk7j88twwImbVm2/mfszVVOTUXhXXE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mtTG9X7ucMMYPkXvH5HV28b2jqvfneVTHN8HjgZd6sepnClNkWmj6NxON1HSu7gPf6ybNCHRsnUMsmEsHPZcTwZ6LZV1nHCfHXgmKkSI9ROVpXSCoYHhTxtGxkhgu6J6wxRJ3DdKR/Dvb/7VBQrPCD/grqsasnvyXhFb/eos33I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FQN/Uk0s; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FQN/Uk0s" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-22423adf751so96097085ad.2; Mon, 31 Mar 2025 23:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743489922; x=1744094722; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WeDpdQ11s16pTzYWJgxvhUuPR0NJcjLGzbI//8eUywo=; b=FQN/Uk0sHVhzodBLTTpyCQCCROoxISSBcBt6u24qD3bSleyULFo5gESgyIV1rN5vHw Kgfe8jJTyPcavAdWLBwnvpcyz87H03RlrbVRRViF6pd3Z+iuDjlNm1OfKnJ6MawlVUkR DMOVOjjBvPILe3caBqS9Tt7DkGLLMDq8gHr4fm5J8OvZ/Utcp6JPUFlHqc1bIiuSM/rB ACepNDkAZHVHENJmLU4AFkRvC8l/0NcD7F7ud78lSkTUYrz2zZN1q7YYD06q33YBwvWB BQf3Z4cNH8kFzwuHDcWhduMjWFHrRSJmD7RXJtUf2YnUekRPYXpNtQtbaTYY2AxrOvIo 9hMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743489922; x=1744094722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WeDpdQ11s16pTzYWJgxvhUuPR0NJcjLGzbI//8eUywo=; b=ibPcDjIIl31DJUegqFL+BVdUaYcmCiGoAMZMjgX7yLlNo/N+V33njYsSDDfXn42BSe NC4zyvDHtTTYsxzJiXOx99DREbCrx6FRjN4cGcCLDr38s22stxZZSrlHXugpzUOIvCnk NdaEs+6TMYzSIgEwKinf2SunZlAPunqJnmdc2j1qv8VTazI/wtMUjcHrAxpSr90W96Yi ZLx/6RXUpGW/kymQ3p+I6UqJSvMTQMT9cWPfq2AanZq0Uw1spgikMpMwAliko2VCv52h 222goEo3PmTKMOzJhKC5zIipK9sai0v4dCPyBDnqtFubCHPcor1EI0k+1tGTBS7NdedD J3cg== X-Forwarded-Encrypted: i=1; AJvYcCVfGUp4dOpdo1mAIh+Eqpyr/ioWs3lHcXXyMnMHOhxxs5K4YOYud+IjzQyGwmdrDPnncbbvvkI8S5Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyFUvi34gXK0An0tSDCGXo5j4/q2l2pxSTSx6kcUd6IW0cBVr2N SGsknTAEJ3+eyVM4PYW1R9r7YHvLLGcMz69N/RmYUdrO+6OFo8hZ/NHC7sZB X-Gm-Gg: ASbGncv9wimAd75GgbbtHP6STYA78YENoDtYgM0yIXKABQeYU5qQCFo/HQz6wt9v7fL qO3pqNjvugaws/ZxU98gOBoEJhXGhOEoEQT8usE2z5sfIU4qjNJqWzYmnvzihVVG4wq0IWGNXAw S7QGsEU/O5gRVme9Js+MM5dX/NlDnVJjLXBGgOBkY09pQ52ztS4348jMpWHM7vmiG3MHmK9u73C /6k2/NUuz5jIp5VhSEvgI9wSlBmOAXHbOwQ50kYnjG1IvIjRncuDtwz1H+GCyr3fFbxG8ueI9W3 HgE4Uqalc/q8HN2OeMqMmntOOnWOfiMdA1b2bF6OxACq2ZDL X-Google-Smtp-Source: AGHT+IEoKQUe4iLCDBC5Yg4jYvRDZLidhZJQmM1KZaRcvS6eTZ7NrElk5kh5PMeurfk9OA85f/lSxQ== X-Received: by 2002:a05:6a00:3c8f:b0:737:9b:582a with SMTP id d2e1a72fcca58-739b611a1c2mr2837540b3a.24.1743489922282; Mon, 31 Mar 2025 23:45:22 -0700 (PDT) Received: from citest-1.. ([49.205.34.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7397106ae4asm8135092b3a.110.2025.03.31.23.45.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Mar 2025 23:45:21 -0700 (PDT) From: "Nirjhar Roy (IBM)" To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, ritesh.list@gmail.com, ojaswin@linux.ibm.com, djwong@kernel.org, zlang@kernel.org, david@fromorbit.com, nirjhar.roy.lists@gmail.com Subject: [PATCH v2 5/5] common: exit --> _exit Date: Tue, 1 Apr 2025 06:44:00 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replace exit with _exit which is introduced in the previous patch. Signed-off-by: Nirjhar Roy (IBM) --- common/btrfs | 6 +-- common/ceph | 2 +- common/config | 7 ++-- common/ext4 | 2 +- common/populate | 2 +- common/preamble | 2 +- common/punch | 12 +++--- common/rc | 103 +++++++++++++++++++++++------------------------- common/xfs | 8 ++-- 9 files changed, 70 insertions(+), 74 deletions(-) diff --git a/common/btrfs b/common/btrfs index a3b9c12f..3725632c 100644 --- a/common/btrfs +++ b/common/btrfs @@ -80,7 +80,7 @@ _require_btrfs_mkfs_feature() { if [ -z $1 ]; then echo "Missing feature name argument for _require_btrfs_mkfs_feature" - exit 1 + _exit 1 fi feat=$1 $MKFS_BTRFS_PROG -O list-all 2>&1 | \ @@ -104,7 +104,7 @@ _require_btrfs_fs_feature() { if [ -z $1 ]; then echo "Missing feature name argument for _require_btrfs_fs_feature" - exit 1 + _exit 1 fi feat=$1 modprobe btrfs > /dev/null 2>&1 @@ -214,7 +214,7 @@ _check_btrfs_filesystem() if [ $ok -eq 0 ]; then status=1 if [ "$iam" != "check" ]; then - exit 1 + _exit 1 fi return 1 fi diff --git a/common/ceph b/common/ceph index d6f24df1..df7a6814 100644 --- a/common/ceph +++ b/common/ceph @@ -14,7 +14,7 @@ _ceph_create_file_layout() if [ -e $fname ]; then echo "File $fname already exists." - exit 1 + _exit 1 fi touch $fname $SETFATTR_PROG -n ceph.file.layout \ diff --git a/common/config b/common/config index eb6af35a..4c5435b7 100644 --- a/common/config +++ b/common/config @@ -123,8 +123,7 @@ set_mkfs_prog_path_with_opts() _fatal() { echo "$*" - status=1 - exit 1 + _exit 1 } export MKFS_PROG="$(type -P mkfs)" @@ -868,7 +867,7 @@ get_next_config() { echo "Warning: need to define parameters for host $HOST" echo " or set variables:" echo " $MC" - exit 1 + _exit 1 fi _check_device TEST_DEV required $TEST_DEV @@ -879,7 +878,7 @@ get_next_config() { if [ ! -z "$SCRATCH_DEV_POOL" ]; then if [ ! -z "$SCRATCH_DEV" ]; then echo "common/config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) should be unset when \$SCRATCH_DEV_POOL ($SCRATCH_DEV_POOL) is set" - exit 1 + _exit 1 fi SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'` export SCRATCH_DEV diff --git a/common/ext4 b/common/ext4 index e1b336d3..f88fa532 100644 --- a/common/ext4 +++ b/common/ext4 @@ -182,7 +182,7 @@ _require_scratch_ext4_feature() { if [ -z "$1" ]; then echo "Usage: _require_scratch_ext4_feature feature" - exit 1 + _exit 1 fi $MKFS_EXT4_PROG -F $MKFS_OPTIONS -O "$1" \ $SCRATCH_DEV 512m >/dev/null 2>&1 \ diff --git a/common/populate b/common/populate index 7352f598..50dc75d3 100644 --- a/common/populate +++ b/common/populate @@ -1003,7 +1003,7 @@ _fill_fs() if [ $# -ne 4 ]; then echo "Usage: _fill_fs filesize dir blocksize switch_user" - exit 1 + _exit 1 fi if [ $switch_user -eq 0 ]; then diff --git a/common/preamble b/common/preamble index c92e55bb..ba029a34 100644 --- a/common/preamble +++ b/common/preamble @@ -35,7 +35,7 @@ _begin_fstest() { if [ -n "$seq" ]; then echo "_begin_fstest can only be called once!" - exit 1 + _exit 1 fi seq=`basename $0` diff --git a/common/punch b/common/punch index 43ccab69..6567b9d1 100644 --- a/common/punch +++ b/common/punch @@ -172,16 +172,16 @@ _filter_fiemap_flags() $AWK_PROG -e "$awk_script" | _coalesce_extents } -# Filters fiemap output to only print the +# Filters fiemap output to only print the # file offset column and whether or not # it is an extent or a hole _filter_hole_fiemap() { $AWK_PROG ' $3 ~ /hole/ { - print $1, $2, $3; + print $1, $2, $3; next; - } + } $5 ~ /0x[[:xdigit:]]+/ { print $1, $2, "extent"; }' | @@ -225,7 +225,7 @@ _filter_bmap() die_now() { status=1 - exit + _exit } # test the different corner cases for zeroing a range: @@ -276,7 +276,7 @@ _test_generic_punch() u) unwritten_tests= ;; ?) echo Invalid flag - exit 1 + _exit 1 ;; esac done @@ -552,7 +552,7 @@ _test_block_boundaries() d) sync_cmd= ;; ?) echo Invalid flag - exit 1 + _exit 1 ;; esac done diff --git a/common/rc b/common/rc index 038c22f6..02dddc91 100644 --- a/common/rc +++ b/common/rc @@ -909,8 +909,7 @@ _mkfs_dev() # output stored mkfs output cat $tmp.mkfserr >&2 cat $tmp.mkfsstd - status=1 - exit 1 + _exit 1 fi rm -f $tmp.mkfserr $tmp.mkfsstd } @@ -1575,7 +1574,7 @@ _get_pids_by_name() if [ $# -ne 1 ] then echo "Usage: _get_pids_by_name process-name" 1>&2 - exit 1 + _exit 1 fi # Algorithm ... all ps(1) variants have a time of the form MM:SS or @@ -1609,7 +1608,7 @@ _df_device() if [ $# -ne 1 ] then echo "Usage: _df_device device" 1>&2 - exit 1 + _exit 1 fi # Note that we use "==" here so awk doesn't try to interpret an NFS over @@ -1641,7 +1640,7 @@ _df_dir() if [ $# -ne 1 ] then echo "Usage: _df_dir device" 1>&2 - exit 1 + _exit 1 fi $DF_PROG $1 2>/dev/null | $AWK_PROG -v what=$1 ' @@ -1667,7 +1666,7 @@ _used() if [ $# -ne 1 ] then echo "Usage: _used device" 1>&2 - exit 1 + _exit 1 fi _df_device $1 | $AWK_PROG '{ sub("%", "") ; print $6 }' @@ -1680,7 +1679,7 @@ _fs_type() if [ $# -ne 1 ] then echo "Usage: _fs_type device" 1>&2 - exit 1 + _exit 1 fi # @@ -1705,7 +1704,7 @@ _fs_options() if [ $# -ne 1 ] then echo "Usage: _fs_options device" 1>&2 - exit 1 + _exit 1 fi $AWK_PROG -v dev=$1 ' @@ -1720,7 +1719,7 @@ _is_block_dev() if [ $# -ne 1 ] then echo "Usage: _is_block_dev dev" 1>&2 - exit 1 + _exit 1 fi local dev=$1 @@ -1739,7 +1738,7 @@ _is_char_dev() { if [ $# -ne 1 ]; then echo "Usage: _is_char_dev dev" 1>&2 - exit 1 + _exit 1 fi local dev=$1 @@ -1772,7 +1771,7 @@ _do() echo -n "$note... " else echo "Usage: _do [note] cmd" 1>&2 - status=1; exit + _exit 1 fi (eval "echo '---' \"$cmd\"") >>$seqres.full @@ -1793,7 +1792,7 @@ _do() then [ $# -ne 2 ] && echo eval "echo \"$cmd\" failed \(returned $ret\): see $seqres.full" - status=1; exit + _exit 1 fi return $ret @@ -1809,8 +1808,7 @@ _notrun() rm -f ${RESULT_DIR}/require_test* rm -f ${RESULT_DIR}/require_scratch* - status=0 - exit + _exit 0 } # just plain bail out @@ -1819,8 +1817,7 @@ _fail() { echo "$*" | tee -a $seqres.full echo "(see $seqres.full for details)" - status=1 - exit 1 + _exit 1 } # @@ -2049,14 +2046,14 @@ _require_scratch_nocheck() _check_mounted_on SCRATCH_DEV $SCRATCH_DEV SCRATCH_MNT $SCRATCH_MNT local err=$? - [ $err -le 1 ] || exit 1 + [ $err -le 1 ] || _exit 1 if [ $err -eq 0 ] then # if it's mounted, unmount it if ! _scratch_unmount then echo "failed to unmount $SCRATCH_DEV" - exit 1 + _exit 1 fi fi rm -f ${RESULT_DIR}/require_scratch "$RESULT_DIR/.skip_orebuild" "$RESULT_DIR/.skip_rebuild" @@ -2273,13 +2270,13 @@ _require_test() _check_mounted_on TEST_DEV $TEST_DEV TEST_DIR $TEST_DIR local err=$? - [ $err -le 1 ] || exit 1 + [ $err -le 1 ] || _exit 1 if [ $err -ne 0 ] then if ! _test_mount then echo "!!! failed to mount $TEST_DEV on $TEST_DIR" - exit 1 + _exit 1 fi fi touch ${RESULT_DIR}/require_test @@ -2391,7 +2388,7 @@ _require_block_device() { if [ -z "$1" ]; then echo "Usage: _require_block_device " 1>&2 - exit 1 + _exit 1 fi if [ "`_is_block_dev "$1"`" == "" ]; then _notrun "require $1 to be valid block disk" @@ -2404,7 +2401,7 @@ _require_local_device() { if [ -z "$1" ]; then echo "Usage: _require_local_device " 1>&2 - exit 1 + _exit 1 fi if [ "`_is_block_dev "$1"`" != "" ]; then return 0 @@ -2512,7 +2509,7 @@ _zone_type() local target=$1 if [ -z $target ]; then echo "Usage: _zone_type " - exit 1 + _exit 1 fi local sdev=`_short_dev $target` @@ -2528,7 +2525,7 @@ _require_zoned_device() local target=$1 if [ -z $target ]; then echo "Usage: _require_zoned_device " - exit 1 + _exit 1 fi local type=`_zone_type ${target}` @@ -2668,7 +2665,7 @@ _run_aiodio() if [ -z "$1" ] then echo "usage: _run_aiodio command_name" 2>&1 - status=1; exit 1 + _exit 1 fi _require_aiodio $1 @@ -2880,7 +2877,7 @@ _require_xfs_io_command() if [ -z "$1" ] then echo "Usage: _require_xfs_io_command command [switch]" 1>&2 - exit 1 + _exit 1 fi local command=$1 shift @@ -3364,7 +3361,7 @@ _is_dev_mounted() if [ $# -lt 1 ]; then echo "Usage: _is_dev_mounted [fstype]" 1>&2 - exit 1 + _exit 1 fi findmnt -rncv -S $dev -t $fstype -o TARGET | head -1 @@ -3378,7 +3375,7 @@ _is_dir_mountpoint() if [ $# -lt 1 ]; then echo "Uasge: _is_dir_mountpoint [fstype]" 1>&2 - exit 1 + _exit 1 fi findmnt -rncv -t $fstype -o TARGET $dir | head -1 @@ -3391,7 +3388,7 @@ _remount() if [ $# -ne 2 ] then echo "Usage: _remount device ro/rw" 1>&2 - exit 1 + _exit 1 fi local device=$1 local mode=$2 @@ -3399,7 +3396,7 @@ _remount() if ! mount -o remount,$mode $device then echo "_remount: failed to remount filesystem on $device as $mode" - exit 1 + _exit 1 fi } @@ -3417,7 +3414,7 @@ _umount_or_remount_ro() if [ $# -ne 1 ] then echo "Usage: _umount_or_remount_ro " 1>&2 - exit 1 + _exit 1 fi local device=$1 @@ -3435,7 +3432,7 @@ _mount_or_remount_rw() { if [ $# -ne 3 ]; then echo "Usage: _mount_or_remount_rw " 1>&2 - exit 1 + _exit 1 fi local mount_opts=$1 local device=$2 @@ -3516,7 +3513,7 @@ _check_generic_filesystem() if [ $ok -eq 0 ]; then status=1 if [ "$iam" != "check" ]; then - exit 1 + _exit 1 fi return 1 fi @@ -3582,7 +3579,7 @@ _check_udf_filesystem() if [ $# -ne 1 -a $# -ne 2 ] then echo "Usage: _check_udf_filesystem device [last_block]" 1>&2 - exit 1 + _exit 1 fi if [ ! -x $here/src/udf_test ] @@ -3776,7 +3773,7 @@ _get_os_name() echo 'linux' else echo Unknown operating system: `uname` - exit + _exit fi } @@ -3837,7 +3834,7 @@ _link_out_file() _die() { echo $@ - exit 1 + _exit 1 } # convert urandom incompressible data to compressible text data @@ -3994,7 +3991,7 @@ _require_scratch_dev_pool() if _mount | grep -q $i; then if ! _unmount $i; then echo "failed to unmount $i - aborting" - exit 1 + _exit 1 fi fi # To help better debug when something fails, we remove @@ -4403,7 +4400,7 @@ _require_batched_discard() { if [ $# -ne 1 ]; then echo "Usage: _require_batched_discard mnt_point" 1>&2 - exit 1 + _exit 1 fi _require_fstrim @@ -4630,7 +4627,7 @@ _require_chattr() { if [ -z "$1" ]; then echo "Usage: _require_chattr " - exit 1 + _exit 1 fi local attribute=$1 @@ -4649,7 +4646,7 @@ _get_total_inode() { if [ -z "$1" ]; then echo "Usage: _get_total_inode " - exit 1 + _exit 1 fi local nr_inode; nr_inode=`$DF_PROG -i $1 | tail -1 | awk '{print $3}'` @@ -4660,7 +4657,7 @@ _get_used_inode() { if [ -z "$1" ]; then echo "Usage: _get_used_inode " - exit 1 + _exit 1 fi local nr_inode; nr_inode=`$DF_PROG -i $1 | tail -1 | awk '{print $4}'` @@ -4671,7 +4668,7 @@ _get_used_inode_percent() { if [ -z "$1" ]; then echo "Usage: _get_used_inode_percent " - exit 1 + _exit 1 fi local pct_inode; pct_inode=`$DF_PROG -i $1 | tail -1 | awk '{ print $6 }' | \ @@ -4683,7 +4680,7 @@ _get_free_inode() { if [ -z "$1" ]; then echo "Usage: _get_free_inode " - exit 1 + _exit 1 fi local nr_inode; nr_inode=`$DF_PROG -i $1 | tail -1 | awk '{print $5}'` @@ -4696,7 +4693,7 @@ _get_available_space() { if [ -z "$1" ]; then echo "Usage: _get_available_space " - exit 1 + _exit 1 fi $DF_PROG -B 1 $1 | tail -n1 | awk '{ print $5 }' } @@ -4707,7 +4704,7 @@ _get_total_space() { if [ -z "$1" ]; then echo "Usage: _get_total_space " - exit 1 + _exit 1 fi $DF_PROG -B 1 $1 | tail -n1 | awk '{ print $3 }' } @@ -4952,7 +4949,7 @@ init_rc() if [ "$TEST_DEV" = "" ] then echo "common/rc: Error: \$TEST_DEV is not set" - exit 1 + _exit 1 fi # if $TEST_DEV is not mounted, mount it now as XFS @@ -4966,7 +4963,7 @@ init_rc() if ! _test_mount then echo "common/rc: could not mount $TEST_DEV on $TEST_DIR" - exit 1 + _exit 1 fi fi fi @@ -4979,7 +4976,7 @@ init_rc() # mount point, because it is about to be unmounted and formatted. # Another fs type for scratch is fine (bye bye old fs type). _check_mounted_on SCRATCH_DEV $SCRATCH_DEV SCRATCH_MNT $SCRATCH_MNT - [ $? -le 1 ] || exit 1 + [ $? -le 1 ] || _exit 1 fi # Figure out if we need to add -F ("foreign", deprecated) option to xfs_io @@ -5029,7 +5026,7 @@ _get_file_block_size() { if [ -z $1 ] || [ ! -d $1 ]; then echo "Missing mount point argument for _get_file_block_size" - exit 1 + _exit 1 fi case "$FSTYP" in @@ -5076,7 +5073,7 @@ _get_block_size() { if [ -z $1 ] || [ ! -d $1 ]; then echo "Missing mount point argument for _get_block_size" - exit 1 + _exit 1 fi stat -f -c %S $1 } @@ -5146,14 +5143,14 @@ _run_hugepage_fsx() { fi cat $tmp.hugepage_fsx rm -f $tmp.hugepage_fsx - test $res -ne 0 && exit 1 + test $res -ne 0 && _exit 1 return 0 } # run fsx or exit the test run_fsx() { - _run_fsx "$@" || exit 1 + _run_fsx "$@" || _exit 1 } _require_statx() @@ -5318,7 +5315,7 @@ _get_max_file_size() { if [ -z $1 ] || [ ! -d $1 ]; then echo "Missing mount point argument for _get_max_file_size" - exit 1 + _exit 1 fi local mnt=$1 diff --git a/common/xfs b/common/xfs index 81d568d3..96c15f3c 100644 --- a/common/xfs +++ b/common/xfs @@ -553,7 +553,7 @@ _require_xfs_db_command() { if [ $# -ne 1 ]; then echo "Usage: _require_xfs_db_command command" 1>&2 - exit 1 + _exit 1 fi command=$1 @@ -789,7 +789,7 @@ _check_xfs_filesystem() if [ $# -ne 3 ]; then echo "Usage: _check_xfs_filesystem device |none |none" 1>&2 - exit 1 + _exit 1 fi extra_mount_options="" @@ -1014,7 +1014,7 @@ _check_xfs_filesystem() if [ $ok -eq 0 ]; then status=1 if [ "$iam" != "check" ]; then - exit 1 + _exit 1 fi return 1 fi @@ -1379,7 +1379,7 @@ _require_xfs_spaceman_command() { if [ -z "$1" ]; then echo "Usage: _require_xfs_spaceman_command command [switch]" 1>&2 - exit 1 + _exit 1 fi local command=$1 shift