From patchwork Mon Oct 30 14:15:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13440625 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 660F617981 for ; Mon, 30 Oct 2023 14:15:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="sr0uUFPN"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="OpFwHgsy" Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98E8EDA; Mon, 30 Oct 2023 07:15:25 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39UDpWx6002573; Mon, 30 Oct 2023 14:15:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=YJJchDpyG6ImdacZ9HqFQiCokJYWvh2AUH5fyvSlrLY=; b=sr0uUFPNmr5bY7R9hTY0UYLa6lr38dJ8WkwfraOHnu/hda8pQjN508/IRDHEx6+BIT6F KrqpOdb9gcN5jGikuOjz1F8d7ZOOtqGNY5SmYbUyCiXpk4KfPGM9qfCBbmGt7HVAp2Pv ni7M01JK2kiCVDiQmk7m3GA3wFfPV73hn7HWGMWHYxp9XZ255oDocrIOQErXAiQoqs5n ub44v5jddpsHJt4lLOMxYbcVwXe3W1/6Jz+iAoO7VMP+ybZr33nGin6ZDGRVuZcmB9dH Pzg8g+rKJ+U5mf4WOGddGQaOZwk0nlL0aCpCMyXAoFBJwoY06p4eJt3kzyq4W1HBrulV Dw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0rw22v98-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:22 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39UE3QV8001099; Mon, 30 Oct 2023 14:15:21 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u0rr4p7fr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=io+vTNRWnB9t7KDIMRP4Xo/8Q1aj/sHpy7FFsZpTT/fQRCmCNYc67Xj9bTdRWg3KIX9zHWxrrO5lFeMGG/GCwVRPbZ4WumTymaD0kVXi/AgAO5MP3LUXpPLBRqaqrY6K3/v5ESBSy+XO7gbQIyIZpcK1a9xjL7r5xe4q/VfJX+oIm8ynNzWX+hVYg4frwY9cBG4s5S8WR88cuhONa6VJRA7OInMLw2sEiKlQlcmkURCjhDiAwMLqH6L+5PSTAZW0HVveC6THiuNONkXC8ax0c2YdfSI2i5h02ajST7MpJwnTbRZFMdXNHLJGXDVFuvv0bd0hVcFAohwRu3p/cS6UFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YJJchDpyG6ImdacZ9HqFQiCokJYWvh2AUH5fyvSlrLY=; b=nXAZd/kWU7eZIewb4o2ssAJdBcUe3Y4orwQw9koCBWrJxCefuoR+rKP6SVX6Erj+HVvc/RGdmA/dLVRNtw326QwQaQRSURRYdKnLTotMMRT9JdduVTeYkdI5PHWb0IoK6GxH72Dv3zVFM38bQngePcrtpDQAYMhunmY+M+TSMly+gFomhZ7VeYmSd+nTVM57uwUUTaihW8bfWg+wTw69eOSADrfsx7b/TDQyiHmAxxsPOuhIOhBw3RNaMqr73A2fcG591rpdLFRq1NDOwWG1/FWQ2JeWySaX1ckMUIaOx0sPRuba+/GFbBmDRJoBSktLS54Cyda8izalNtVWUNje5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YJJchDpyG6ImdacZ9HqFQiCokJYWvh2AUH5fyvSlrLY=; b=OpFwHgsyZFAk0tOQlPerwkHL076dK/fA4JYvupaA0ISiFBgNrRA26cvWvfj0MwHLVkJhgyL+l8o/VgcoCkL1jTyz+TShC13TywL8A+6oU6ocz+vSK12Smoq7CqvNynbZy3IT6fgulqHQd2A1BMfjXbfTw8x8HPamVS2Eb051Uw4= Received: from SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) by DS0PR10MB6127.namprd10.prod.outlook.com (2603:10b6:8:c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Mon, 30 Oct 2023 14:15:19 +0000 Received: from SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab]) by SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab%6]) with mapi id 15.20.6907.021; Mon, 30 Oct 2023 14:15:19 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@kernel.org Subject: [PATCH 1/6 v3] common/rc: _fs_sysfs_dname fetch fsid using btrfs tool Date: Mon, 30 Oct 2023 22:15:03 +0800 Message-Id: <6ac586f4697e84c846a36cbc42b005c254b83de1.1698674332.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: X-ClientProxiedBy: SG2PR03CA0099.apcprd03.prod.outlook.com (2603:1096:4:7c::27) To SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR10MB5694:EE_|DS0PR10MB6127:EE_ X-MS-Office365-Filtering-Correlation-Id: ae860652-24c7-487d-59cc-08dbd952a5a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /RaMlVfLgiIdhAOzThvGkr5x4YV3rk/O0MFS4QQg075+X8UjmdaSgNNBaakIdjOriF//xtsOORqwgpb6CopzYGGwWfGUF0TiqLNdflpCwlvcW/G1z/8bNq/ptfFJJpm4MTSXNXpvVjchdbUUBMxGePXBZY13oiJlru7Th8kHpDGFDpGKh9YDCkQ8aF++huc4ZFsqd+CZP+nzcf2NHNCLHL4gPE+9GO7kL0/LIyolFwWEaYix6wLS3XiXsvmY7+CCj2BefFOWntSzV5W33+eOyGrCj7BxhpTTHUH/LuMylJua2f/O+oAgVmuQFmeyt3sfrTuk8SuM2u9l/PdduOS2E/gGGsS9Pja661GZSQIiao+OLtcIRwuJ4lVZ13J45CXzmCcA9b//g4RJNNa3rmiukhES19cKoveauvbJDKHSt8MqMTOerwEHsIwvK3v1KfGvt5wcIFOTWscxqHIdJWWDtA8o6xEo0RezURWhCQmMwlM17w4kRfHYGtGYAOlZcI8S1LwTLkZF3INz+QhQn1BtdfOA/gb6IHbx1Bdg6+H5DUxP7m5OY5NT4l3Z4PctiGWP X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5694.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(39860400002)(366004)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38100700002)(2906002)(4744005)(83380400001)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(66556008)(66476007)(316002)(6916009)(66946007)(6666004)(6486002)(6506007)(8676002)(26005)(478600001)(4326008)(8936002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0dU+1gx3Frf8e+/+63p7Kd60NiV3jTMmfvaH4WqDO4s5hvC36fAjxuX16IPilSSP7rASLUsNPTLB5/Ku9/Z0F5yFbeiqZ7i7GBCRnkpagiPdTPZfQTHB0x3f0aX4isO7ohW0Zm7+4IyYFxCjU7tKm4KuB8y/z4JgJEvGZ8cGw7cPvEmLzg3tM/2yUD8lObhc87io6zfUyoGMi3EbvtKQ1I2CVdHh7Pm3/jPCrhyNxpiHcROc/GJnrTYR3hM8JApDjtfCiLBVcDBe405GDFvZZPY7s+Yy3W2NP3z6cx8jGP113UfrMuvVzsQBxtl23M2SZJ4Z2yivGogYXAVUsxs8JJCZt4zyqKD70dW+VG1mPJXMT+BeLWB8tX1N8uE5Ow7iloXHG2wK1YjDljKIoFA/z0QLeP/0f5zshkPn2GLB00+7RD/GMU+Hqt9c3cV4geoBoMPLfQPyq0XZok8WA4St1icp7f0qCUSJ/O4rhjHRclBLQyj7f+Aby7xo+2+/DSkF348gSv2qq5dt2XupGuzkp6uIz8Dz7J0GjL7RMLlo1NPubnXOxPwL3rgyj6YKEo9V/Ank2X0mzuj6X8PYR14qf4yCI4gVT3OYuFhAD7ijMbZaAThW67svAWlzq2b9aiuN14qKd7Vfi11/Tw3zM9oVO7rE8LryLQ1zlvejaVTfCPajCw1HJBhA+a/zKOw/hz2gY5OPKpLB3ZO+i5ac6l94sP45xDlEfK4d2gxsyqsxBxfOBbgA1wPlvpnsPlOdGn+MbVvwN9+OymNrIuvZa+Skgy0rtt4uxe9NESh3NDl5P+1lcytuoYRAfDO/j79spxKYmhtYf65J1BUVpeK/iDDHXwUuLAx1XCd8LKLYrpg2992IA/6qJwsfzyOz0bTwaFjpTMv33ZI1s+Hqn9r/Z/qcyEf9LjK1PUkbtW9J0m3DE5jbZGe37GtJW0QB7RhC3xC3UzCnqkdaQkXqOkwlC2+mZcQ2ukjARFGlOsVWuHUo11XebFPpFW2MF8O6E1VbinLsJA4EhCBAILYmFVYGgRg/HKlzZ5FIBF4WkN95Dq11gTg7M0xZyPmtAzt65XJ/LwJlNm5c7DzPHiZYdg8pT0qExd4ZpJuRAjULD+RbZCYuVzueTlx2uMAc2BIX4pd9K2Y2Uc7okMhXfeSH1rzi4rx6EaJ7MicPlQFTiY4XkaUJnQm5D1y+6uDsuvCgjm4biaDWIQ/W2PS0pmTeO7qd1vFUzl4n2CD3hde88q44/Cgsx0vNqPxYTBn5Qqu26E9OqirbV+pyTVAy3QTs8Yw2TFhN+fQAlZ2cXhd0fCzoZXmhGvUPbpbuhAP62Vul7y1iLKe2rRWhCEu6VQSxc94Hsw6IOsg8E6vxFrpUhUwG6SSc7y49+5qLKtp93ZV+kHLd7tgwTWCml/N2zME5ZNR9DV5pz5Q4zkOAuMzUCxk1TE1QEhc0gdOunrTdJg7v1Jd/kUvmqg8fleaC09+sFaJbpcNfk0WTLZVL+Fa6wh4FAOsM8AStaP9lZECilomJiZ535jLVEEQqXC6ByknbMTggrGTmX9t5tRa1Cw+fekmq/pqhVQiJ2HRXI4F6CwJ+MaCl2joM X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Rop1oiQ1VVCZut1KMN4l7tkgr7EIuYAbgImBeos16YJGIaq59LLgS16NHRTQsxRdKx1HOUnMuMij0eQAVY1KiFfffaY4OZSENGaAn2JXX3pnXYGg8b6YWnaGSNzWMzNAQhqiOwJv2l2rlEOqRErtantNROMa7+tCTvoM6Q8Cu9Btje1drAXaUcZukU88Jg0OSpr8NBAO3D7N1xoVCRbCWSIXZwe6ujfSOw5jBpSQgZ32c93gYdDRKFwA4kcgiUs2jUH51sEenFTXri6BOHZi70CGQqgpOBfmXI7ZJe4VG79H6Ur+/190cCrx3tB4S4rDTGssarSs/rA57yDXrEBffydRnAlpuLl1YFE0R5YKsfnBytk8s8SDOfLpRYj2gIdthlY7Lfku7UTFKXYM/zpYTZ+ehtVV/oUH19/4zpQF7kSXxtUPSH9Tl766Beq3XlonUHaBiyW1d0L9MzPJrUb1UFBlXPQnC7jBfsSSynCX56mNF2p/fXAJamUXi3fOgQJpeycWM6cam3CfLPKNYeZzE2PhzwimN+ng+cOsQH3ZIuu2yy2d6EaHBgd3cYdKkxZTlsVO+9RCbn08ruherwxNwvquh9w5FB0nOWrPmr4t6v/A5yin3f2efhWas+65PPD1GNDi3g9wuhQumk4yNzFXlRoZqLhMdp0SnDcdE9sf9RnUUufvMFfu0vAguFQeC7TwDcOugRK1ax5tW1qDQiCJAwTArDoDrFGHmuMEbMW7rfVLY/YWXvK8PtbWdUN5p5m0KWjx8XMw89V6Y0dB6wLTTSC+LnuGMNODc7xMRQN3tXU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae860652-24c7-487d-59cc-08dbd952a5a6 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5694.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 14:15:19.4984 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iHJ8gIYX7GlICsQuTRYsgzs1ACN2n6DySWBn+aKLQRJR7UC5azmdNLnQXK4QPOZc453k0L3Ja0HNtZk0pPFy5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6127 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-30_10,2023-10-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 adultscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2310300108 X-Proofpoint-GUID: XgVbmtZY-4tdYtf6qpIRzTg6LrHbXHLQ X-Proofpoint-ORIG-GUID: XgVbmtZY-4tdYtf6qpIRzTg6LrHbXHLQ Currently _fs_sysfs_dname gets fsid from the findmnt command however this command provides the metadata_uuid in the context device is mounted with temp-fsid. So instead, use btrfs filesystem show command to know the temp-fsid. Signed-off-by: Anand Jain Reviewed-by: Filipe Manana --- v3: add local variable fsid common/rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 259a1ffb09b9..18d2ddcf8e35 100644 --- a/common/rc +++ b/common/rc @@ -4721,6 +4721,7 @@ _require_statx() _fs_sysfs_dname() { local dev=$1 + local fsid if [ ! -b "$dev" ]; then _fail "Usage: _fs_sysfs_dname " @@ -4728,7 +4729,9 @@ _fs_sysfs_dname() case "$FSTYP" in btrfs) - findmnt -n -o UUID ${dev} ;; + fsid=$($BTRFS_UTIL_PROG filesystem show ${dev} | grep uuid: | \ + awk '{print $NF}') + echo $fsid ;; *) _short_dev $dev ;; esac From patchwork Mon Oct 30 14:15:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13440627 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 3F9BB17981 for ; Mon, 30 Oct 2023 14:15:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="v89XjiWV"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="hs0AJ9Or" Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB75DE9; Mon, 30 Oct 2023 07:15:30 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39UDdmFi021009; Mon, 30 Oct 2023 14:15:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=odNJi9PHlhXSuWLaj2HvnihquTDl+bi4PHcRPfCmTr0=; b=v89XjiWVXBgEjObLO4SSN2qd5FArT4eZqm9RHaCfmXu7T+rvd2wFEe5ArDjZBrau9Hbi 5gCIaLpXi5HIga0dD52iPbG6iR4FFyGi1Cq+WKMaUhEqQ40b5queKOcvhzDWbrl0GWEa aRQjDh5NX+hWO6ABKvHceHXsqjgOTFTYHI75H4BOLlHZPioL/GS8YM/2hSW8Cm5rDowF Z2NZFDSkpDAqzS76tUN2RqpwxI7K6NtVfTqDLbTSMcdySwISIoqbrXzeIQdn7OwtrFsM EtuL1ZxjR7L0uneqX3eCOAqkYrIwrkvHIARfTTUX+NzlVCV8V/TV515Ryh1sNwmldvw8 QQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0swtjw4v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:27 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39UE47WW022584; Mon, 30 Oct 2023 14:15:26 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3u0rr4aujn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P/TvXFUDPCjsYVC/IX0qu9KBH7xo3cbIYakw6mQ2OV/hMIo6qjdeyMqlfaVxSnfyNe+ltXEEiOx4TWnybtdzjSyX8RrS2CTQAE5h9rP0TwrmxeEEq34d8XS09oX02QJdeJr7jaIXxKUF+rF42gsRitwv0FkDH4g89m9u6eanXVSYZMZcavmXS96lDGDdhQk03B7Mwv6IAUpcihY+Qags8lJ63cRzbhxr5T4+Sd5k55FpDlsqDkOa+ld6K+8+/DDHzes3BjKYuAOTt6vBQW0D048zw8E2+ustj258sItuMrYMhVkD3OMIhrg5Hgt0nnlulKBOzTZrYLmVVepPBmoZbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=odNJi9PHlhXSuWLaj2HvnihquTDl+bi4PHcRPfCmTr0=; b=DhZRQTLKTtw0K97tNkd5SlWtVOPsSGIiwAla842F47cWPOrtMNUKGkO36TzMQdMrRJ830jUzNl1sXiRe7f4bMTfj7+CX4998+3GeoM2FxlKg5YCT+kp4comZhoEapRQbZnqoAUYW0Q1kXUFgxhjrOc9e5AWQdGI2/Kz8x1tbVyZvFN41hG1s8Tc/kt6TSIzIqqYCTImhMmJBCp5U2QF3SfhlpCyOmjePItLw7yrNruu9q7kKOoVr/UKghMXgHiKrRPIBFOxR8kX06SZRLOR6QTlmQZGvJo+Zw+xzcrUHkfnpFBs6NK4cftTiKp8gl2Gavd6AV44kcFBz+jqlvdbFoQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=odNJi9PHlhXSuWLaj2HvnihquTDl+bi4PHcRPfCmTr0=; b=hs0AJ9OrPJblixkUQ2fCwnbJ+2T386xclh2IHTpMRhmI62It10GmrAP4dAeF3dDtZquNy9QTfKE00mV5QStX+BCcchJ27Sfh7VP022fqK99ohMChKfEgFnUx8ibR0G52Hp31JzlbCD2xp0sWzrGdVQ7ToBFraNNgpzlm+wIrut4= Received: from SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) by DS0PR10MB6127.namprd10.prod.outlook.com (2603:10b6:8:c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Mon, 30 Oct 2023 14:15:25 +0000 Received: from SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab]) by SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab%6]) with mapi id 15.20.6907.021; Mon, 30 Oct 2023 14:15:25 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@kernel.org Subject: [PATCH 2/6 v3] common/rc: _destroy_loop_device confirm arg1 is set Date: Mon, 30 Oct 2023 22:15:04 +0800 Message-Id: <1f320bb0c1e11dbe441dd44eac006873de5f267c.1698674332.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0023.apcprd02.prod.outlook.com (2603:1096:4:1f4::19) To SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR10MB5694:EE_|DS0PR10MB6127:EE_ X-MS-Office365-Filtering-Correlation-Id: c69bc734-d8dc-4e0b-fc6d-08dbd952a8b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 27ZnuGwn+2jh4bgr4o78umMw7BrieLwYrolPvsIhwgC3MD80JMnnTp4IYrG2l7FA52c5Nk5ToOOzxZAxd5ChgBDDK5M0DDKw3l0FyUQGBF7WWaCwW5N1Otuey0Dz0ArH9uTdy143q5mQhoqZvR6lAAO4eX0Ztb97uBhCPhN62oC1gPNs4FAf/k2JJPHoMgmKs3mytWfwaEIwavWIQovT8Eq4dRuqwolla3s2jXpOnVMnuhiSQlmFxYOuYBlQ8nX0mlMRC8SYHPmryAAf6MlzEXQZm1xMMmRVJHxdw0xHLMoJBoi42sAryP6HGZ/boxr5Xob7KPUFzf/qGONIwkkerXpFRcBs89o7k3nNrXrK092V0OwV2eyLQqNUR6qd+8qAtszDzchqhL9cgGeoaXqoplzE6cSVHBghxmqtUPuKvy0mwbeHOTMc/jUvZbrgDJVoGf7OhcIYg0Fez66HoyjZNS86+eTMiUqk0SKkifLq1BbQubtHbQz37N1jeA6ZBbpH6dXysFH5s3f5WQsgij9hEYc4C69BhHhEm/OFg1V2b3r3Qz34Xj1kshSTeUrjL3kB X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5694.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(39860400002)(366004)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38100700002)(2906002)(4744005)(83380400001)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(66556008)(66476007)(316002)(6916009)(66946007)(6666004)(6486002)(6506007)(8676002)(26005)(478600001)(4326008)(8936002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PKQKr2M5eaVj7xG45o74I/luR9D/c26W55Q7PHK0UxyI5OQEMSoWq6bZiRCua1VIw+twlqPGn3iFKER58Rvu59HNJcyc7Xk43vjwiwAlD4AtVlFjHOtTdqjMsyUnTwBOky0acbwaO+cdezys6gSA1/f6RcHpys+bE5AUufSvnTw63QIR3dsiCXBCef8ZIriPBCLufDsbDqPYCo8aaNYNKn9sfigrYxDg5UJrgDOIRhv3UmukUkNhMw9zpAfgU5QrmS8fzcahYHyRBdYR3oQPrdgjRMNjEEojWPv5FMYdKb64odSLwmMKd/Fqm4oQnEDI5/jL7LpCbrstZD1aMQEViuF1MXgm+cU0HCL920H+RI+/M1MeXJ13itA7andBBgH0XYAKrVJ/b8PYwRfmBr9WSwCVbfXgeCbSoQoaDf09OJ3BNGfOyuvJvVNyhv0yPOQAUC1AEmajnCPmqLStTOrULYc58CsMa3VthOOpU6RIKl5XyDOIARe5H+h0oiPYQw54Jw9R5VngvXOrB956HxQlTcDrhG0TkTGohd10dw/shngt2os19loNpd8dy/giYkMogRsNQx8S2ocU7M6HKJRAgCp0nlKMoNFBuK0cSPoZVQn8yA9P/qL6Wx7JAHMWNh0t0rUJb5KQOq7jjLh83WXHVGdNcahN4YwmNfGAxTTB+sRGiJWhkwebvXHT5D0GGQmBnT3FTpjXRCDvDVNCmAolLEY7G+qQMs0QUH5FSvVEInII/+CWOMTZnpt/+tlaCRd8nT95B+rbfSwdKLq0Ha3gC5FXkNdZX9v3rnricBvSBV9mqvqZDuEgXVlK7nh52QdeS7lCRCuEVv118yG7DVGxYTcE5YShOm+Q4SL4Jojkk6aagsH/1v9Vz+E3nJb6BF8neTVj3ojOTQqOVwmUZtteqXHuy4OPRkHMlf+XusZwYb2lKMXc/0+Gouib8OpkrDwUcjqZJLP8PhSypsbltXmBlkzCgSqZZhOdZJHtJ8c3ocTEK/YDKRb4Jb6x5t0u37vJERPMnr//IU9OEX/szZC4jGocOB4v5eGcMt4gRezWSnmdixMYxeQL0/gXjiL778zLu8LM0L3sESbaVz+ugvdyyb+muS2/D4iF7UGltgIVexycO4n6QEffqdERgr6HRqG7u4wYHhmfZcZTgU9ltBlLipB/OM5vd6wUf3DVTtmKdrlWmkYwKL5WqB+eZ1GymyIfKBPcJQdhdYhqxgew52PLkIelV3xocsjnG5vpesxOh5kwlLvMcLW6gJod9xX6NyiqY2a/7uJrqZFvYwur25SNKrxocHCUzWDy7aP3/EH4Vp3nWFH3dxhac3PEozUSojervw0BlHzobompmkQ8kWZTY1cOMWKj0Gxsdm9dshU1BMbNQSRk2GaUm3/o0tqmacMypqU3ErkqS0v9nHUqlmEYHarrjOhYOuyPNVR+B3YwHGkKlSR2ou1poKi4nLBTiawGHMqN5NiiOF/bkVTnDwy6ydE1EQhtt8bujn5aMcYj7I5nsHntaEsrRvQrajWUB8bY0fjKumbG8P/vnNqg/B+Eky6XQ4xLyKwCapDccBU6/zPCTJ+GLCeLkkJAzoKQ8uFV X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: /UgdD/wSrBGL5o0rvn7R8q+hTiTaX8ozdKXsT2yUvPRSczaccpjeI3lE8Liu2iY3y64t7P9gRI9y+6cR4OpTPHW/YXBXALWGuNIHOQHLkX+/qfTmPI7k8LwGKPYzzhn6oX2middOwXaJBREcVbVpe2fG9SBw2f8XzCBspzQMLOj9XyVmJjB6DkRFZ2j73d+dK8JLbaPj1j+/PsM83kbwuvqKLETq+3WrmSV0B/YVoaXmRiL4hHvv5ZQkJLi+WZqmNmYRtmhnJIly1AQ9PhETdSwMrZPF9Ke2Op9ZVmqSOsIJOEyU8RrGyUg1GDKZe4/AYi/evO0mD5kmjrZboQelirAklBm/Cv7NXT+rJAB6Cj8neMZFQksRvoh+cD/WwBz1LdJdvZt9CQXpP5IUf7+FE1SBN8U2tLmUuz4C31bhPnO1xHM4uYL4TzZ8TxNfN9i1CA3zGzgCukRbr32kVAiB9t48/X9n1q6msor1F5HduS9sePWCneI17cVnTvL7bE4jZBaIWz7rli6wiirOD9mlDD47iltO3G2Ix6bHt6tH4bQkMtGqtrIGVqBtpBFfA1tGFY9bVfaW2PJXbSfbiOtEYqD34m3PFX3BiWMB9xIS29/PZGwrLDtiWU+kdKpkCQuB4og0Tour2u7npZEHnjOhkkVQsFqGoqFbsJZxbCsK3IGJVo1AMXm2LWkZZTmwIBHoa58rPCqgqYcK1jHlcPPNLgrBsSDwsshLRaTTGxa/OnFWiBFNgVDwhmQ/DHuGpBtcYY82mxn55o+80ZJz4gWh4kxjPMVeuqh00fWN53Ze7PY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c69bc734-d8dc-4e0b-fc6d-08dbd952a8b1 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5694.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 14:15:25.0824 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H6agnP3Kvu0ISEXsngtXBjti8FxVIGj7F1/rgJ8MaJnSA+7tWUQOSIEXM9QOZgvcC5LGjrDLtlv5qB+AYg/kWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6127 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-30_10,2023-10-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2310300108 X-Proofpoint-ORIG-GUID: 2NfRpVUq6us3S1Nz2i1XpfTZHXbgSSYG X-Proofpoint-GUID: 2NfRpVUq6us3S1Nz2i1XpfTZHXbgSSYG Check if the dev arg1 is set before calling losetup -d on it. Signed-off-by: Anand Jain --- common/rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 18d2ddcf8e35..e7d6801b20e8 100644 --- a/common/rc +++ b/common/rc @@ -4150,7 +4150,10 @@ _create_loop_device() _destroy_loop_device() { local dev=$1 - losetup -d $dev || _fail "Cannot destroy loop device $dev" + + if [ ! -z $dev ]; then + losetup -d $dev || _fail "Cannot destroy loop device $dev" + fi } _scale_fsstress_args() From patchwork Mon Oct 30 14:15:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13440628 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 3C8FA17981 for ; Mon, 30 Oct 2023 14:15:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="rBfBBGmW"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="xxaCUWQY" Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43812D3; Mon, 30 Oct 2023 07:15:35 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39UDPp4b029827; Mon, 30 Oct 2023 14:15:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=n30dq1749UuUblcvGipTeRsEhaoyfdQM7GjLaWKFkXs=; b=rBfBBGmW/jl7+oMR0KhhJeOGQ98YvqQvum7spcTKJxqY5GTQ/EHBcxgpdivE/lxNa8Uh 2u9LYErCB5/r1DuH+kSBC2d5beDixM4Wwp7hEBATb5piMPLA5Vttr9jWgMCXdqnqclwQ ZFgQ7Vjz23K2DdzloXrBOizJw5cIIOz/9N5iSP2qN2aqhrNBalInixWePYDcdNO5omDj 9nhPLb5M4f1LxqfqcSYE8AXwqM/NA4UzLvjf8x85F/IfjdFHw69RPoMcYXX74Z+i7cRu e9qgNwOVOTUixxylQwQlbqxAQ0NKmlgi6YBm/udmlXduW+SzcmstfH+JIlimSNrIp9C2 jQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0rqdtvxr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:31 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39UE47la022595; Mon, 30 Oct 2023 14:15:31 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3u0rr4aung-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AotuGd8VgiKrhWhsCPDUbwxe7k2s+LmGYnse8FAnpnyUoRAASIhS1F2htCEaekS3jroTpPT1NKbgBGsTbsCTcwNF9jyHdiH/rEcpLXuW/rRm9tLMTM4Xulu7klk21CJoyBl7XVuhD03NUOn2nrdYtdiSlZk6P3q39RCE+6pyRL/D+dUTVcG5aQTUXywkVxSz3G4YTrzkgWWkisGqABKJ1uHAJyXCz71c2n/d6/GLZzDU3CWlf/ecYNVZ0WcX009iZ7QaL+/maBtbKYlfiapVaSykhaSObkxKxY4GAMdj3so8jezi90mbV9PAj1TEz5HHHmtjdkB3to277X32tnH0Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n30dq1749UuUblcvGipTeRsEhaoyfdQM7GjLaWKFkXs=; b=VREpGpmkhAswNSXnScfXt14wOu4IHFHuhXAKINZY3sLOxmXuBgzeaUEQI2lhBA259bWf+ipZkqYr5v6RzoSYxc72jTTVoDX2IpSVw+GiNhJ3xElmfbw9RUkSF5G9tPHoGeoEJbJQljUc0zeZiOmQ+IOx+kT/pDfA2T/EJckLi/OHQPddmEZWlkZkQPSfYb1VGA1bfoJ7bjf9N4LX0KwhbgW0BHAO0Lf9GnhnhN5bqJ7qvJElWSfrkkYT5l+1rvEmS3Ib/FgSrjj2HWoOGesprxgswiyV2A1Uo8ohstEcVtAFfnIN5Aj1qlbnM9xpAQFf0LxiKTrAHt+qYtBF0zgHAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n30dq1749UuUblcvGipTeRsEhaoyfdQM7GjLaWKFkXs=; b=xxaCUWQYgZjX5V3gPTTIPpfcSGBnQsHK0g8Cj/6BNyvLQWbxl41UtRjtTu4HZRe/Iw7C3KheJ8bbjjGRCT4P+TpNsji8eclBHk1XlBWwOtxw7VRRpzXIOKHFA3vXvQc1+Wkxa4JXMNQB1Z/KQYmZhVk1u2+pf1los7zjidEOO/0= Received: from SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) by DS0PR10MB6127.namprd10.prod.outlook.com (2603:10b6:8:c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Mon, 30 Oct 2023 14:15:29 +0000 Received: from SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab]) by SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab%6]) with mapi id 15.20.6907.021; Mon, 30 Oct 2023 14:15:29 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@kernel.org Subject: [PATCH 3/6 v3] common/btrfs: add helper _has_btrfs_sysfs_feature_attr Date: Mon, 30 Oct 2023 22:15:05 +0800 Message-Id: <077b252e8affc50ad3d7826d57ba42a2a8746d13.1698674332.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: X-ClientProxiedBy: SI2PR02CA0037.apcprd02.prod.outlook.com (2603:1096:4:196::8) To SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR10MB5694:EE_|DS0PR10MB6127:EE_ X-MS-Office365-Filtering-Correlation-Id: a361b643-4519-45c0-6648-08dbd952ab84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RKafzI/1T5OUdF6ajAGesCZ7FICge83ew+mzdyMosgsErIfTB9Ici1VbVURCjBcZPA268aTJouQOkx/poMIFAXb5zA+Kx1Som7GBsVSna54Rbm90V1Z40XE5oPeP/a93FcfeM/JnnmmEmlkxSL+sDRRMHwV48rKtSmtVu1lkAJfPdaAnDTYKAVTKJUHVdSTGTbO3+QfYgtV1DXTBymXiRl1Lrb+NEolkwfcQ7dBDdHv7BcQi7X7AuLIIjghtB5elCjPs9UQ3cNrXv7YTsy1RorcmGuBPbzQoAJOGi4VtXFDWQSxUcG7kvvQV48DF3PM6ScFbXd3f74zgdK0IpRCXSHbjks7L/iMEPOr5Q6BSbqf04p4V6ejoXzjSlEZxUw1ToMwrfGl3hsXZngX7mSP2RAiD6T4n82iIjPXJB59nchCqCVfh9WFPAtkVgux2oAwY1AJYcJ2o9GbJELpvOi+F92nrtzBA1dATnkiG2JKjE96fuXGl5mAQTwbnZWjVOoyHJYgZHxoVS6zXoaUaZU9spyZ8AVEvue1AkV4N5LjmBsin09DQ7AUlsRz5dcq1RCfH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5694.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(39860400002)(366004)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38100700002)(2906002)(4744005)(83380400001)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(66556008)(66476007)(316002)(6916009)(66946007)(6666004)(6486002)(6506007)(8676002)(26005)(478600001)(4326008)(8936002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j5ExTMChO2+29R/NtvSL2NLbytRcuz1TpqMzoEcL8sjKNWuAS1F2VXorOWmDVwel2QisPe9iz2GikBDhsoIu/7k3RhMyDRIz+4wKS4AHADfYNMfgrd7fwf1/LTOAcmnAz9O+EDtWAYbeaPX4Qg+5ZyQPKFQpR1sY0ZhbRNBgftJDZKsSzOU1I4uvZvo7ZSr2aABw6Z95QNIpXsnY/7ubvR7tA91lLU5a4Um1jRahr2oJJmAoyzX1seaCuutKswaZUEUww6V9nkmpK5ShrGdh9bcJDjlp+rUmKfEVLQLW2zJ3LSJbYkcepMmNUZY/u53hJiDtWDOGLZy7kKge9M+lZb2r5QFmOa3S7+kG+b6aCGYjidtDBiqpkdEdgx1hadmjMA73GPioLelrF2DG3bDtAYNNacyGpkb5mWDGfhy0HuRrxXhZkRHB4nYCRoZvqGBr996xaAwkTimjG6c2eEc1/LoicXKiIVk/BrE2R0LcGCZzU3YSLjc/PVDtj7Yq2m1Ul8J7rF/AuARu0UtbD7VCgeL6UCvcyxkzNgWXY7yu5BGL2yWaGIqF9Xh8iZZa1P/NQdgO9kEqT2xPGW4z4gu6QJM+hhklH8dXlSbi5eTm23WitwFHSGrJAXeMb3U8gmi6PszFOkGT8/zKd5DFbj30alrDIDEDSsyPyiLBQXiKaX2wkSZhi+xpHGSu6uapkBP1jvdt3XM0snkmfrHzIoN00xKiW0+qobog5h9nfCpaX8Ea/aSo5v9/ZHj+rysdAvtCUq3adYSko1Gxr0bqCciP6OcjualQaIoZ7hx1Hvlb5cekRqd8ZtCLBpQVGYrkASroN0gDvUt/XdPNcjUpVNQA0yuvquR+//d+4VaNhrsIlcjJxh+Ic5vCIletiSuuEtKc9b5NNtK8JDnQDsf50of3yJoEEES8JTh5S/M1bNBP6FZyKB0hKtRVwA/ISOriKMJ5lfRri07KsE1RtSYa+RHDRqqoEfOZ3JxGX9W2fYL1NxZzWkDnDLS6n0BHiYidN/u6B/x0HWwvXoquPgeKlgRTlOo9hJLVmw+plBkP+bSRp5Ysc/lFp4dKI9aSmQ+q/kd9zXZqNFMgtGLlPPJ7fyn7SqfsmisRhI0bhd9iwWGsxNXw44C0hqoGYobU48DDW5m7jEO/VYROSpZ953UmodPwXJWbmK6aJGkcybZWfhHb2NvAf+8T9GOuPLIRjlmxcAA2LQBURospn2141Ehd2NdNrW3Eug93+fdVwG3mxIk4J3+odiloPcCga4olDX7d1X5pckx4VGoeIXKWpJplQxzA1uZvRxoafsQyqFSnL2kSayUb9Pi6LCIQdto4gWCO+Vyw6icBJJA0H11V/XunTU3Ks0SkqcdAW0vrT/WDjg0Z/xopoWNjXQRhnd2rY/uQX08ISXRhZvHqOxBWj+4UcIAvagnVVyt63gTXntY5eujc65CpQyxOLjfaW/g6Cbm7DFb5ZB+IrXyjZ+uXjD9YNb2jXmGW+2UcEcmgO2tI9fPxQuCi3ZIgjQgFQB6dRFbb/C2yBu0eYtNPgDBxbyCObrOJMX2OKexqgOpGUHUoDAKdUrL/ZOgsJSHTJuZe8LxBSbOQ X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mrczD8g3ETrtlPEerzG4Kq+qgMQkWQqw8HjX208FfcoWJDg25jzzxiDzuDxtGHLV1FsmeHkU0TOrYiPquA6gHWZJFgd2im+3EsPLa/7wBaXRZlcHwTOqPVuCuvK+n/Pxoe605mYXexW5O4kzQP429ZON5UCEjLd/08kKNw5VD9cNFHG19qyRJGdMR9FOqGJckPZw1wSeh/5qsDC/7kM/202ZdJxmf6ZgM8uGcMho0093s2b7gxRkrhWXbiEMncbdDG4lcYN1lJ+pVxspXJiA+k3BZk/GcU6IeWu3eg++pERjMw2EVQLH0EdXmM4X61KIKVaKew8ziYa4KVM3ZCpLLjsOQPN4xr62TPRAYF84lK3PX00zYYZxuvVJ+dtdnXDqr3Z99FvnQrIR3lH5QZCB6AP6QWc8hdhGkX2EaWe3MlThI/1XE14uCA5urQFEULW1NyZtep+3c9UoN1YpcZG7Ys8u6NMwqJ/gfQ1zSI79AZGJe/SnkZm/m2XPWjagbOCvtigp7sbUgIAOa5M5Mbkcj7yQUloCkzcttfso+nrVmq4rwDuTE4dKWRUMoPkTlH6iXPVbsThXR/AT87oFLYPW35DRrB6r7jwpJbQsRqRIk80y3KITyHWjGkuLpPZM1mizOm/q/AyBMhyM2/8OMhzd3XdvhtiO0CrTjKLuzMy3ndlRxMs52IxgjNcWsppHdjWWPIOSR/OzBtQ/WsnK3a4IQ6jBOk9UICY3j3tBz+VCznQC1NiqU0K+kpANINvuaYMTStpD2iXteO7wY+ZTdL1r9tiAR8L35nY+MNLRAbT+lto= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a361b643-4519-45c0-6648-08dbd952ab84 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5694.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 14:15:29.3220 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0FIuv/cvWY9kaDk1D3fMwZ6joj+SSp/p+HX3rzB5q0J0ZhGqd4QD6I3x9Fvf9ik99WFhO28YNRractioxTUqGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6127 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-30_10,2023-10-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2310300108 X-Proofpoint-ORIG-GUID: yDnSvSdngyBu3iq4LBEW3hSSa2g2eVGS X-Proofpoint-GUID: yDnSvSdngyBu3iq4LBEW3hSSa2g2eVGS With this helper, btrfs test cases can now check if a particular feature is implemented in the kernel. Signed-off-by: Anand Jain Reviewed-by: Filipe Manana --- common/btrfs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/btrfs b/common/btrfs index c3bffd2ae3f7..fbc26181f7bc 100644 --- a/common/btrfs +++ b/common/btrfs @@ -753,3 +753,15 @@ _require_scratch_enable_simple_quota() _notrun "simple quotas not available" _scratch_unmount } + +_has_btrfs_sysfs_feature_attr() +{ + local feature_attr=$1 + + [ -z $feature_attr ] && \ + _fail "Missing feature name argument for _has_btrfs_sysfs_attr" + + modprobe btrfs &> /dev/null + + test -e /sys/fs/btrfs/features/$feature_attr +} From patchwork Mon Oct 30 14:15:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13440629 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 DA5E917981 for ; Mon, 30 Oct 2023 14:15:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="2xAt3FtH"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Y4viucTc" Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B97D2CC; Mon, 30 Oct 2023 07:15:42 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39UDF1Oj029628; Mon, 30 Oct 2023 14:15:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=N2As19RofGLWvKq42bc/BSFkvMBJ0OUd62z+1ocTT9k=; b=2xAt3FtHRlTTrQsyZmqAtJ1tP1jPE04zETKGsFv4pCFVPHIq3Sql/0tyMprzpAjBUM5f xTjR6ZPNqTJHln9bbwfkcqZ+TxkLNPt8pTTT2AS2jfersAyF55/2dql1IEnyiarh0NhM KqfH/XMEnPtuWUGczyERRTES0yD1WrEcyCtxlMyn0k+Zo1UTK/iM0E3NV60TPd2bCU8s jcmbONrWUJ0rlUAXYIYf2ILXxR3vvYMzGMsQlkIet6yUbN6tGJnR1ia6RZAfS4Xn+L1H qG1G7XQMAw85bLFzRK+PnfzOlAc21YjR5VowA/vJHpPd25u5tiAnwajcqUxLREjbn8bc Lg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0rqdtvxx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:39 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39UE45iU022481; Mon, 30 Oct 2023 14:15:38 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3u0rr4aut2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DMNzLaMewIvYT7FVBPYs5yhWB0CAzk2OanrkWprtJBA/2W1QMYUkkzzcqJgi6+536tTth8EQOt6Y/hUCNRMPt+M/QxDChQoCtSKR8sAQAQS3uFcXdjCJc7V2U4SLH4FmDrFkgIRU9QPRisDsBcfr3oju3Tk6b9aQKPA39z9K1bMzucES2C0j/9xhkrG7NQhqIP9m5SOfKNUbKbzs8Upy1uOFwkGLFvfultbCpPZuIk9teapKkyeIb0vaS6J8uRKPu5yX7zVjjW3puqf3Kfaf1uExQNKsshcACz9r2Oh5Ok0zqk+mBfSPjI0X0M12DQKY7yg3Hm7kyWXwySHCyIZFUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N2As19RofGLWvKq42bc/BSFkvMBJ0OUd62z+1ocTT9k=; b=CTqWBICx+m0COniVpVFp/eKhF1HHo8nN+JBWIUKCkbXsOV9+MDddBkF2WD8XQNAx87IzKWuCeiKFD3qwS5toVtjH5B4y3l+kUEqRHyEFxGyJerJmSNgUMxRfeqqdHCaYAzMBtYsRkAbMz0EY+YnJn6VsU3JrzoXXIH27jYm+u4udo5JTuBeMlsvowI5c6XU3Xbu/i4kxtXpLup/hMS6T0pvTKFkuf+Bx/bby4lEqbHBTbM6687lTtvMz6Bzx8Pq4N4CKULVN6vYKspH+9E65FhIPiShkZRuugnYN1ph6odnHfq3wyIHTdxIBuBgWPBLLCwmTAikJ2ahEwzEM+cL+fQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N2As19RofGLWvKq42bc/BSFkvMBJ0OUd62z+1ocTT9k=; b=Y4viucTc+YoHLLLsrfolXcrMAr1Udm1fQUXc/CFmlkmlvFgmFXvZWrjYDaJXYSGw4Mf6CuGdQG+yYLrwpYa/Z5kTLtExsBj54NLYAlo6SEVQi0Ux/PcrRfHXCbmjD2nsnfbONRYFts0xrNdXVWMZpgrL+XXykfBMn9DB29KNh8o= Received: from SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) by DS0PR10MB6127.namprd10.prod.outlook.com (2603:10b6:8:c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Mon, 30 Oct 2023 14:15:34 +0000 Received: from SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab]) by SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab%6]) with mapi id 15.20.6907.021; Mon, 30 Oct 2023 14:15:34 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@kernel.org Subject: [PATCH 4/6 v3] btrfs/219: fix _cleanup() to successful release the loop-device Date: Mon, 30 Oct 2023 22:15:06 +0800 Message-Id: <3559a441f8dfb450881001b7f4cbf780d7fa178e.1698674332.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: X-ClientProxiedBy: SG2PR02CA0081.apcprd02.prod.outlook.com (2603:1096:4:90::21) To SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR10MB5694:EE_|DS0PR10MB6127:EE_ X-MS-Office365-Filtering-Correlation-Id: cd89bf91-1c2c-49f1-1cbb-08dbd952ae84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y+lZIgEtVeDcbpEQc1luj6GOToLCWD6NOvw+BEmr4BsZZtM24D6o/CevwJlmGAZms4ScM6iJezH3tkPGnqv7QT11eCgngWf+0F3krAlijyRaz1cfltr8SXpiXnk9zzz6o8riNMSItBjHji7QJTZvxcEJec5xCrLEYGAIOikUm0y4Jl0swxQBHT/ORta3jOPUGa9nuVcv/ZnNStZv46zUg8dOnP0zR710wEj9/lkZfp8hQl/vCJimtXAoAOWRc9yTAYm34hnxNOp1xNv4pVFIhYfwIKZ8wpYsW7hlV6OdXBN2fz0rKWELWd/yXL5D0dpjVdpSYANcrOLyyaFS2StT+7NWrQ5LkEZAP8V0a7RzyMn6kanMckbs7QWIOLQcVz/VM6S3eCG+heyLlub5l0+QeHE021VI7ugV+1oZDq2VrUXnBN/8lAEKjhtC4iQ0RvIl6GP5oXIzyDEISBMWqlbj2opZ2iU+efNXu5qhA5T3Ffx5bsrAqjxPACSh9ZuQZrTvqfbBRU96gIlUpKD8LJJUvtvDQT/8WGzc/C5MCyQNsR5XjjD5+V0DdaWrHEZ5T945 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5694.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(39860400002)(366004)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38100700002)(2906002)(83380400001)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(66556008)(66476007)(316002)(6916009)(66946007)(6666004)(6486002)(6506007)(8676002)(26005)(478600001)(4326008)(8936002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nk1b6ebbPi9B6I6Oqfo+jwagoC1Y21uF2vSxSIHZDFVIIO7jGje9v4QePTOtuIu+riegRdqNorOXr9vgoUM9OYyywjpCTPO15xZD5iZAtB1WVP92g48z0zDJ56CGwmPfq0gqqF61KU9/ROPbLg2kqBstRWrwkJC+MBtfE4bUV2dYB2YZmD9EnceuNO+lyi4NCJcoXDzNbwrDs4k12jsP1AQraRjz8uriweXT/7FFLH/1QUHdX/MTVlSF7uiScvbKDV9mfAKVdwxFjkrCUAf/E/r22UbP8HoRKF5zPK/LwcYq0el0/XvkZOgCZV1N+RkTmpzbTMZsHNk8vT1VNSWgY6WbZBtxsESuHNtvrnkw6v5fNr7D8euy/afapwX3zsvLzeLue9w05ScoO76cj/IQzAXvz0w1YPX0YKk813nISLwTF1mcKMq7NecgjU1jRENITpILwN+7aG6s0CgyOsKMdYmAungRqDUAjx3x9y3aTg2jNmeBujnoCOobOkt1AnI04wrGvTbcNu11TKcnr8nNM9L0tnqPd2wdAX40qcVilhUsrz/DxG11w/NabWj5mNQzjhxAtcF/3W2pZwIp9ID9VKqPmK154ba+cGQumSUNaqvL3kDNUDXbqBfa8vowZ88Qt+04ZLV87S7OM5nzvyP5Fuik6YbFMLdk5wQwWyCqrg2K406W9ECzXO/jOh0cLciEH6flTDddsHSDhIAPmX9CbJrmwdcwl1gVF+gK/9fLN7hIvafCrl+Bv7I1qokknPAtLsT17VO++Ha1SVQKvEJGw2JP6LFAqWltBknQifZxVFzfgTeocKjIzlApZNFLXOlLEbHgxTB79CpIHrKdemvB/2YtL5Hxs5dT9HTHJRE+I1IgnHc0CR2awj6vA0i8HpOjU2R4ZDIaHV8dQj+6xTBhQiYz2ljaeCz5Fmz2su3INqDsjVldvig1Hi/huubOaj85l79zk8XPvjbE3z/BHiKu7eAw7Lq0onK+b19tX6dTI74A65Jxv8dYCGQkKQAvybBm29qmieTCypTqYvsvAPWp8gptfrkvO+x3nmcZbOf5xyoj+Arc/+zuq3fni61VWxvUS2mlVI7HosNh6QcOMtn5YQQWSHldLV6jZh1Lr9KojmUyiMktd1wuf+K1EcMZBXBEgeUFS+PDZTrvC1XgMzWihChoIpIKNyS/dNQAMcdYhq0UNe0Q/4NsDX2F8IIFhQDebaHzHb1zszmgjXtOt6aGMsLLrH8tyOhCO6MuHpL/vZCE5TXnKGlPeWiIg6Xtlhw/oSwkts1Fme6G15hMSr6B4H5oo8FlHSdINSPAWWBjBhklV8xJGJ+iid9KPd2f+rzK64q9TRB7rUCofdjYhUHcSq7eq2DiT1WFuDyosXSNAdgU3ExO5jNDaI2J8S29H/KsY3G35bZfr8nZ8gwg17Re1FwSdLCZUmk6wkUrm8BDcGLWNYPOv31PY8QRTlVOby/pDBliavhQdjMpYjpaugZyxqLyenp0e7SIbzexCywmFY1ny4Kl5a1WdMmwwAS2I+vw9B8vCaxfadSUFmBFWU9tOzp69Qt1rEUe76nQCxLFnyhxav4oAMdVRgmvVm3xZ36e X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MrozQKKvpFWxI1b2aqkAW5gTKS+YheyH5MJrN6ICB0YuI/q/HReHtDFcXyq0lcq+c+qh3p2PSWjad16t+bCCOjXACaSNa7nGdtPu+mpZiX0EnPSZEIrF9+yiQCaiRbbXpyAvd9s/KiDf0km9iXuUhpdppW+3oZjxFVQS/Ef4LaoB0v3+lu6CsAdoZLORBfp006ROBFo1zCQwNHmjEac76j8qrNY6hQde4IH7oAYbciC2fXdza42gtoJydRO4lqzvZS/oD9fmsgPt2PglQ/kq5gjApJ/DYWehL/L3tjrvWjla09r7/12kG+kxNhDViQV6urxxuyphrmuGkefR2NSjghaJVuiuaM7im6gbkQ47SL3En4F9PsgKk/uoNdqVAj1iaMqEE1+sLLSvgVG4PY9dln6tsSSAEVO9a7R593jPbZl1KtjTeRNA9nte2WUYUntc+nC0YNeoph90DaJZCjsiNzw5wm7zfjwJr9NOJVafcV0P963dw5EnIiJqGjRnyYvUmyMCtKEdbYmnUwDUkxqm/q/FQFrEgaYr20x9Z2jc+i7frcOxH5/SfZFWYV0mE+DLv8G2Kwh14PhKEMM3eTlk6VB5ou7iKUfs+/f7M7i3aNJdAa7Em8WT27csQ/J6xdTrTn9LNa3kIOHe7NvEo2CiXa2nLXoUX1F+6OdCmxao63RoJDBAduwH3QpAJjiDU/XpwVzHUe46W4CXjd9GEW13hVsmSOxXJNiLo0B4g4lY/SjkJiCrQ/raWXusFGYpjnIStAL8zk1GXrqX4BHUPy0lEZ3JwAscFnELzPxuJ1oAecU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd89bf91-1c2c-49f1-1cbb-08dbd952ae84 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5694.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 14:15:34.4424 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 15eNsztpwfr1Mzq76zx5cBECoXrms8gzqAdQq0K/q/F14iFX8QY57y8+kEQc6NocqZ/S5KY/w+aues71dgxMpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6127 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-30_10,2023-10-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2310300108 X-Proofpoint-ORIG-GUID: PWHIr5bViEBrnl4MYNskLL_mkTN5obzl X-Proofpoint-GUID: PWHIr5bViEBrnl4MYNskLL_mkTN5obzl When we fail with the message 'We were allowed to mount when we should have failed,' it will fail to clean up the loop devices, making it difficult to run further test cases or the same test case again. Before temp-fsid support, the last mount would fail, so there is no need to free the last 2nd loop device, and there is no local variable to release it. However, with temp-fsid, the mount shall be successful, so we need a 2nd loop device local variable to release it. Let's reorganize the local variables to clean them up in the _cleanup() function. Signed-off-by: Anand Jain --- v3: a split from the patch 5/6 tests/btrfs/219 | 63 ++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/tests/btrfs/219 b/tests/btrfs/219 index b747ce34fcc4..44a4c79dc05d 100755 --- a/tests/btrfs/219 +++ b/tests/btrfs/219 @@ -19,14 +19,19 @@ _cleanup() { cd / rm -f $tmp.* - if [ ! -z "$loop_mnt" ]; then - $UMOUNT_PROG $loop_mnt - rm -rf $loop_mnt - fi - [ ! -z "$loop_mnt1" ] && rm -rf $loop_mnt1 - [ ! -z "$fs_img1" ] && rm -rf $fs_img1 - [ ! -z "$fs_img2" ] && rm -rf $fs_img2 - [ ! -z "$loop_dev" ] && _destroy_loop_device $loop_dev + + # The variables are set before the test case can fail. + $UMOUNT_PROG ${loop_mnt1} &> /dev/null + $UMOUNT_PROG ${loop_mnt2} &> /dev/null + rm -rf $loop_mnt1 &> /dev/null + rm -rf $loop_mnt2 &> /dev/null + + _destroy_loop_device $loop_dev1 &> /dev/null + _destroy_loop_device $loop_dev2 &> /dev/null + + rm -rf $fs_img1 &> /dev/null + rm -rf $fs_img2 &> /dev/null + _btrfs_rescan_devices } @@ -36,56 +41,60 @@ _cleanup() # real QA test starts here _supported_fs btrfs + +loop_mnt1=$TEST_DIR/$seq/mnt1 +loop_mnt2=$TEST_DIR/$seq/mnt2 +fs_img1=$TEST_DIR/$seq/img1 +fs_img2=$TEST_DIR/$seq/img2 +loop_dev1="" +loop_dev2="" + _require_test _require_loop _require_btrfs_forget_or_module_loadable _fixed_by_kernel_commit 5f58d783fd78 \ "btrfs: free device in btrfs_close_devices for a single device filesystem" -loop_mnt=$TEST_DIR/$seq.mnt -loop_mnt1=$TEST_DIR/$seq.mnt1 -fs_img1=$TEST_DIR/$seq.img1 -fs_img2=$TEST_DIR/$seq.img2 - -mkdir $loop_mnt -mkdir $loop_mnt1 +mkdir -p $loop_mnt1 +mkdir -p $loop_mnt2 $XFS_IO_PROG -f -c "truncate 256m" $fs_img1 >>$seqres.full 2>&1 _mkfs_dev $fs_img1 >>$seqres.full 2>&1 cp $fs_img1 $fs_img2 +loop_dev1=`_create_loop_device $fs_img1` +loop_dev2=`_create_loop_device $fs_img2` + # Normal single device case, should pass just fine -_mount -o loop $fs_img1 $loop_mnt > /dev/null 2>&1 || \ +_mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \ _fail "Couldn't do initial mount" -$UMOUNT_PROG $loop_mnt +$UMOUNT_PROG $loop_mnt1 _btrfs_forget_or_module_reload # Now mount the new version again to get the higher generation cached, umount # and try to mount the old version. Mount the new version again just for good # measure. -loop_dev=`_create_loop_device $fs_img1` - -_mount $loop_dev $loop_mnt > /dev/null 2>&1 || \ +_mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \ _fail "Failed to mount the second time" -$UMOUNT_PROG $loop_mnt +$UMOUNT_PROG $loop_mnt1 -_mount -o loop $fs_img2 $loop_mnt > /dev/null 2>&1 || \ +_mount $loop_dev2 $loop_mnt2 > /dev/null 2>&1 || \ _fail "We couldn't mount the old generation" -$UMOUNT_PROG $loop_mnt +$UMOUNT_PROG $loop_mnt2 -_mount $loop_dev $loop_mnt > /dev/null 2>&1 || \ +_mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \ _fail "Failed to mount the second time" -$UMOUNT_PROG $loop_mnt +$UMOUNT_PROG $loop_mnt1 # Now we definitely can't mount them at the same time, because we're still tied # to the limitation of one fs_devices per fsid. _btrfs_forget_or_module_reload -_mount $loop_dev $loop_mnt > /dev/null 2>&1 || \ +_mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \ _fail "Failed to mount the third time" -_mount -o loop $fs_img2 $loop_mnt1 > /dev/null 2>&1 && \ +_mount $loop_dev2 $loop_mnt2 > /dev/null 2>&1 && \ _fail "We were allowed to mount when we should have failed" _btrfs_rescan_devices From patchwork Mon Oct 30 14:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13440630 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 6635C17982 for ; Mon, 30 Oct 2023 14:15:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Q5ErqZxr"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="jdrGg7xl" Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2422AEE; Mon, 30 Oct 2023 07:15:44 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39UDocqv021750; Mon, 30 Oct 2023 14:15:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=SEjeDcT+immK+Y2GyXU3TZIMCoAfB3yfnOPwdnbra/Y=; b=Q5ErqZxrL4AqTLXmoITQP0JelowVNJTC0WVqmtBwg2QkMif0UgdGOeH+D0kx66UYpNJ/ dUy4NqlGQrUR2Yc+urQI0lO7nZldQgIiKwT1Nj1nN9eFyN/9msBirxtM0mnmyfti+FqE QxKHQBShbs48dobRrz/0XaS4pF2pgAotFKpAm9yBHhjtAxa4N9ejyaAgcZZzQQboK4Tk 6eFCvlf+8PDdvtMhDR83/p9SHzpwlkT6v3alHuhPlJUlED4OqHZq9pSprBHj+mheZbnh +ZRDfkxcpY6EWgIu41/0axeEbwVdi4WrJGYiNWPIhbfsHJDCNbXKVdicqViO9mUzVIio Jw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0t6b2t9s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:41 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39UE3Pbm009110; Mon, 30 Oct 2023 14:15:41 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u14x46jr2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M/LAIyAb0yEcvv0vRNIMl9mgCBJbDApKYaUCKrxKfIg0kj/Dfd9iHgelDOEip/YNIDvdKobtCeBw3qFy25n8InCa8iZngB8HjnUIVVZuslSf0L9XIZBo9IKNCWKifGlrZ16N255mqj3gSTnZ6JhLtbsWjtKTEBxic8xZW6CMqbnNmFGmpdDTfrso8z6/yoTM9C7bsKWobr9tBznBFYpSX/MO0g8s4Pw+s/VPuMWK5EeTaG6oXX+NT4IJGIdxP26TSnF2c8M+KhfyviqXTzIKJcjPnzVAvYuw1ev+f/lfViTVpmlgNapQrC4AdiAYQQJdJQkO2p0H8DeDOwt19Xyf3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SEjeDcT+immK+Y2GyXU3TZIMCoAfB3yfnOPwdnbra/Y=; b=fp1QYPAKOCjLXFKOilsQ811Qhd+606Mof1EokuvPhtWx9Nkj3icStVZ/tO2QaRvs1pZTB4MR3o46gNZzTcqCt7WAiuVE3MArpXgh3L1HLmyi3cLLnExuZApWcZeRJY8epByd29Lgbwx9AEeyNbQ9ersRD6scjhPwUGsEr7biyDEzHC8PIAWkTnR4ZUqCSd10oK6i3N5YQkSnVhkuTBtFFdMFemSvDDXcOQAbD2pVLy+pbgFgXEFVLkKEzv1dKLLtcd2PW66Ogp+3lrQt+oRYXWQ6cm15z13nW5p2wkE4iszcvl0q6ad7HoHP8Ik/WVNiKGK6zIeIpQDe7lr2MQEvlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SEjeDcT+immK+Y2GyXU3TZIMCoAfB3yfnOPwdnbra/Y=; b=jdrGg7xlP2zDtG5rdsMubI6sv8j34iDM2SIrsawZC0IUe7Qavp6v8/9hK/KHyl/eRx7gNzF9//CMTQIGbgmoKx3rGUIMcb/4N84rGiQXinKrMjgt88OwtQJ/gh70mela3vSRJChF6+JZG1yw4BQY2sV0yF9MuT8jbrWBfxd6cSM= Received: from SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) by DS0PR10MB6127.namprd10.prod.outlook.com (2603:10b6:8:c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Mon, 30 Oct 2023 14:15:39 +0000 Received: from SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab]) by SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab%6]) with mapi id 15.20.6907.021; Mon, 30 Oct 2023 14:15:39 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@kernel.org Subject: [PATCH 5/6 v3] btrfs/219: cloned-device mount capability update Date: Mon, 30 Oct 2023 22:15:07 +0800 Message-Id: <63f926ab53abb279fa0a836bd1391baaf308afc4.1698674332.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: X-ClientProxiedBy: SI2PR02CA0023.apcprd02.prod.outlook.com (2603:1096:4:195::11) To SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR10MB5694:EE_|DS0PR10MB6127:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b607096-de08-4091-fcfb-08dbd952b14c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 15ksTbTXjNKBd/xL2yubmlrGBTY7/nbYIUnirEhut39t0jkJngAmOjjlHSml/+0UiWi2fkvXJcVEEdLeNNXxmZiyfMfcSG4OvSoKAxXDR3yQCLC3S1b2rFptZwnTu03aJr++ogHhheVCklV5GFkQxFtipa8Ct4/RfSI3d9+FmOWboOsobJXgTx6Ygynk6pOUFfFWzl8qXvbIh+85Wtb/lpui0uBiMsh+5yNgM+qOsVlNdHxT9gBQScICWU0wWxdpEj2XJRzFsn2gD5zcWdXOBC0KyRzBbZTnACwjUegPsX8IK7BeDcOP7n7NUuJl7ra80+Vks/ufUIgjmlj36FGHvNH3NCBOkxo5YzoFcGAq4jWfOYcCHCRNYmMlYwxuwmvuh9zUa68D7AdrihVk/d7IZSzeiGo3WaALM+wK5yeF3xm1zpYnMq7Ke8o9f7j3coX2tLAlmueHnZZjnszE/w1RBc084YJD/QjCoAlrpXxqVXmgGZP+V+zXBXiEa/Dm7ujmMXfPoTo49h5aL7EPiuIaHss5dWuw1itD6FKjb09njDI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5694.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(39860400002)(366004)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38100700002)(2906002)(83380400001)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(66556008)(66476007)(316002)(6916009)(66946007)(6666004)(6486002)(6506007)(8676002)(966005)(26005)(478600001)(4326008)(8936002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NSnrXnBn6jBASDoJbjXAyqw1/0hdUdrjArtWJeWKab1xmTOKNbrMjDBulQDgNpMrjYU6mEVRYhToOgGZw9HKdBsnxeT9gdTwU7g4+pw0teAjiSGrD7rYstqhoQo2ZnM2UlKE5JRZ6W2RXIeApLWi/0MYrWusNX3Rw0TiX67Nu679FN17MYYs0hKYMx0bBJ/rGAGQMxyj+X5+HMz1+8/ImYmjxOOcD+hfUgwySf0ay0oyLi2KEqodRwZBhqS8jffDBRIBqq8te1jHhvtZt937FZstuq8kcpcTbPsSiLszxtV9Z6iSRhjyvZ/pY5BK9lMj+3h3xNBM0U4MVfwek8nEVZH/R2BAX4LotIy2Nvp0WzV+RJnP+slgWw9qjA75CvU+Dr8JGV1u3bw1H8qn045SmVLolYuQpGHZuUrPkIOO7K35c2iT5Jl7ZGLqC0OTrCpSuYgjysGJDdC+YzXFyIMSr6ffz+zd5I/01gxDkZ7zsG6ek45whIi6XeJQGpfIR6oljURHWyEdEaMOfRo/Q+aPVWPGm87vHrsIYNEra1EJtdaCrTyzSWZxOvoKiXEWrn4RmSHxjrw75GzfEshKyH3snAYsGoV1aZEG5W0vmlsPtlt6xXFhDij75Sf8zaeG8WUTZ/ayp4l3ohwyMKzUA5oebuE3qTfP60u2Am0sXc6tcpV+YtM9ePQhaVL5jqHSno31daLAqKUdnuvv+9d2gRNfzs9PyZ9ko6UnxOOHco+6xE8BKJylFwbxfHAS43kQIepN5NFfoKgWuQloGM7uBpAnLLslv3a0Rbh2Ae8PFfwrrPRV+DeWARmwFtntt1GGGksVMEpCF6TypZ0/KqMPgc7z1pH9bDkJoJ7jX5/XaYEZ8+GlgBxCR22yYEcXlnau2jkXZ7hw9X/+Zq/0iaFAi7LKGvA7IuCi1IOlmXpPaVk2WdZtggexrFtojdMwM9WXjalCuIcWrsqohP12/V0DgjfzVsdLf2vECG8xAFBl+tHuJJ2KxEHVmLhGTyNAwtb9xIaTVZaepN2CEHVjRvroEri8eY9NZwovJs89gyF5PoTN+MFLH/soZ8VgDVz6EVIHyYqsVnLdsaLLQpWxPIZw7O5NjL0qV+qtzG7CtF/I2pRajcc+y2yHbc0ZyU3RcsCnSodxNdveB0PGFFHXLmo2q4fjrkNTDAUajOS7nsK4sBnPwmRLMNe0LdwoDzKZww41TRKJ0qyF0MEgsLaxusQAgRKx9mpujozXlxz2YHr4x037vXRIlAByBnPC0YF0Ye9QVwgYxf7dWlwTJtt58AMlJQ6k5qkj1VfPC7XGNn1Rl2LIEtY2LimaeAJ5MMNBcDNVn1wyhI2sHNqtieSwbSmHjlWWB6QMbE0dffEse1K5lKu/XvrVMUd0ates+EvjDhG7gY+1TZrMnDO/IM1hHN4T4uV2d2wnpa0BlY14N4MNEvdyR6q2H7vGXoT4brzx+uNUoVaCQWlo63hnu+aM0hl4LoaLjVutE1YwYh3jskaFiKSbrD9jplHIBp/BgOPVOPZxICEQ/ZizI3YWgn9BJpqoaHpFvk2nYIF29XBHSJJed28iBL/HdMfYdiem9cFFCE3qjI30NQbdFN/bu/JdfLKMF3F58A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ne1EM00rV0h8+Crxv8NE3/2Eezp6yal7Tn4k5OAppXUefgskA24iFZGVlFDn7vJljuuv1zUMsIEWRUpgHV9x5C3Kqw2F9Sro+1UZgrXeHx8+M8UXrEqWh8lp4F5NA9CHaxhT425zZ9kk/1a4ThVlJyumuO/BiARYqPyDRsLHSBDr3p9OMc8G/KWWJteDfNpFmNQO+YE+F0Pp7Z6o4bB7b8X0vJme2/NO4aOP3UrSqMIePTdwQID5f26yDDLPyfDqNtjiAeHb2Kl6IFxfeIFLbfk/DeTyvXmpn+YJOXQaHcdXMl30pJNSl3Mn6FL2CldZdhLgtAFzpQIvBDEFN7jDcSHdFtNBnImRFAFtYO4BOabGiz0Nqi58Oam0JTNoEzKVq1pARttna0V40of1R1Yh0+43nWGTlMr/1L6QdAxmK48l9ww+vAk7RMZanvriifxvugygYcwaokO86Bq4vFGmIt8KMAyX5QmRNitWvQVMYcN8ObJV1YaEuKVaeU2T6ROKMolsGiRVyJ/u8qf+ZGq0re6boEe3VzVnvmYVUKWAX8r2j/Clu5TtwSBD0L6gxIuGfhmtl0KcWhL2BT0uinOPFPIDQEhbcp7CotoGMxJ/LIhCh3tFj+37i1CYXnrIEXoV0JDikoiRmn7DIXKqbLo3nn4dkQ/Zs3hafXQSuHeI1ad5TqO55+4XA/J2B2CC6PAmlsSx3XV14e9yKIFGtPVTChfCDRFguILjBnxtE7M0nYlukZBjcJvI3voTS0gK4cwEDEJ6ti3jdWzWv4bWXdDjSG9LFHBfnyjoeH+7rD5TdnM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b607096-de08-4091-fcfb-08dbd952b14c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5694.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 14:15:39.1412 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iGCOZk6UyKfZ0ZbHrjSkjlNr8xl3argeNoyZ7ATL3QJYaFaeZfA0x2HrA+nIu+CufL4igyKOD/4A2k8Qczj/qQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6127 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-30_10,2023-10-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2310300108 X-Proofpoint-GUID: s4czEAkP42MAIuOmSUBOA0ubIVFbHOlB X-Proofpoint-ORIG-GUID: s4czEAkP42MAIuOmSUBOA0ubIVFbHOlB This test case checks for failure of the cloned device mounts, which is no longer true after the commit a5b8a5f9f835 ("btrfs: support cloned-device mount capability"). So check for the non-presence the temp-fsid feature and do not test for the failure of the cloned device mount. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202310251645.5fe5495a-oliver.sang@intel.com Signed-off-by: Anand Jain Reviewed-by: Filipe Manana --- v3: check only that mount of clone device fails if temp-fsid is not supported. tests/btrfs/219 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/btrfs/219 b/tests/btrfs/219 index 44a4c79dc05d..3c414dd9c2e0 100755 --- a/tests/btrfs/219 +++ b/tests/btrfs/219 @@ -51,6 +51,7 @@ loop_dev2="" _require_test _require_loop +_require_btrfs_fs_sysfs _require_btrfs_forget_or_module_loadable _fixed_by_kernel_commit 5f58d783fd78 \ "btrfs: free device in btrfs_close_devices for a single device filesystem" @@ -88,14 +89,16 @@ _mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \ _fail "Failed to mount the second time" $UMOUNT_PROG $loop_mnt1 -# Now we definitely can't mount them at the same time, because we're still tied -# to the limitation of one fs_devices per fsid. +# Now try mount them at the same time, if kernel does not support +# temp-fsid feature then mount will fail. _btrfs_forget_or_module_reload _mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \ _fail "Failed to mount the third time" -_mount $loop_dev2 $loop_mnt2 > /dev/null 2>&1 && \ - _fail "We were allowed to mount when we should have failed" +if ! _has_btrfs_sysfs_feature_attr temp_fsid; then + _mount $loop_dev2 $loop_mnt2 > /dev/null 2>&1 && \ + _fail "We were allowed to mount when we should have failed" +fi _btrfs_rescan_devices # success, all done From patchwork Mon Oct 30 14:15:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13440631 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 21E0C17981 for ; Mon, 30 Oct 2023 14:15:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="vqIrIvMu"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="AS3ougRT" Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 056E1C6; Mon, 30 Oct 2023 07:15:50 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39UD2C7K011859; Mon, 30 Oct 2023 14:15:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=qlhH7Ll3v/GRYG47BVrph9fsYSXYpVT21BbJUmJNFdA=; b=vqIrIvMux04kFomsE+96Hc9KYdtAQqFlU9CHrLf/ARzy7Sag7uX+1LA9TMLFMxhYJ3pC yZCNk9Y3XLgqjoBb+IoY4KQ+h1+JATu8PJ/yrZhKNissAHVkbxzzW+3FgllSVtlAJ4vx iQBsVVxnA6lvdBJHAuOuS/OEkkWZ98BzC+aoDxIYSlwyh5Jg+RQlRsKQi8fUB/bchDJ0 p9Du2q85sT/UvnVNBfUiCrCpLSTu+hXTw306ghanpvtRtwdXDknMfLGuvJjX2B8NjsY0 vERkuZD+H9OiPxk3Ut8diHNIvyV4WAggB66ICX349vD8ppAhdCNMR4FKYvnVmKkrILYr yw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0s33twx2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:47 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39UE3QG9001067; Mon, 30 Oct 2023 14:15:46 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u0rr4p7yp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 30 Oct 2023 14:15:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TlYofMGt3zm7G6zTTzYA5rIavnwTfbpw+7wthE7nkg9KWHJmFc8i2KAOgoqmefA4/3gTUbl/ZknGi7sb++5G3OWzUHHgdjD+wTVsZpeNClIcUx5/qYt9Lembn48h3Zs0fhpmHMMQQar7xy6vR49m3Wb9GCM+WBRWhgUQW+mtyqto8zPUmRsLzyvnNp8kbh4bPmGPHi6InnO1I3lcSjXPDxBzQ6k9L211fiPbYNTVHHIxMy6DQbrZDs94+Q8RRqFFgTKdXajBXDXgCMHUiBTSqJT0G/OT14Qu2TuNRXxpdpVySSfWbKNs/q/mo3evl8+jobrlLAd/AisfNEyF1PkzMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qlhH7Ll3v/GRYG47BVrph9fsYSXYpVT21BbJUmJNFdA=; b=gtP3IVeLWF4K2STzTVW2dGuTJnXNoep/cAlhG5xwRSHB3X7Ddec9V/RDCqNOm0Z70uL4kVoxYwDVlysvlmZxs8bBgDMR08SOxr4NGfxcledHUNYk7nOn4yhlnCZNJmoHcK4xPNUuMsJ5sigGQmjpMjPKDK9Ft0DGMwoHBJ5PjsXfbcNxgHJfoWl9v1WLA5K0jeYa8+UPzOFR1RmQB90W+fCepvZtzgfHMRmpm3VTrm0xZlmG7/4eBMt90lJP9g2Nse3pcCvgSnxQZrcR2Wzu+jdOEqT/5qzhpaHNkljpTSKPJZFusVoP3cB1aab8JUBpRFKivI2uh+2GEgRtZT7l4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qlhH7Ll3v/GRYG47BVrph9fsYSXYpVT21BbJUmJNFdA=; b=AS3ougRTo/M69QkKUC78DtkAuNtHh6efoKFgHWZfEPg+tApjhey7DtVVr7bu4IL0jw4CTsBQJsGuAdH0OjRtiIuPMnvUBl35JZGHF3J9qsqhSN0C+r4vNrTaqKssDW2MMpUPjtS5o7gvCt8v1SGtVWpe0xI4Ss1J07R0ey7zoW0= Received: from SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) by DS0PR10MB6127.namprd10.prod.outlook.com (2603:10b6:8:c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Mon, 30 Oct 2023 14:15:44 +0000 Received: from SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab]) by SJ0PR10MB5694.namprd10.prod.outlook.com ([fe80::9010:707c:641f:68ab%6]) with mapi id 15.20.6907.021; Mon, 30 Oct 2023 14:15:44 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@kernel.org Subject: [PATCH 6/6 v3] btrfs/219: add to the auto group Date: Mon, 30 Oct 2023 22:15:08 +0800 Message-Id: <5c22b975907174835f5a42e4d53b482b266b9056.1698674332.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0004.apcprd02.prod.outlook.com (2603:1096:4:1f7::12) To SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR10MB5694:EE_|DS0PR10MB6127:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ab3ee68-34c1-4b9b-d91a-08dbd952b472 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7gN98IGYkjx/qzKkPgfoikS+aHt+uSkOeTeK0/FGDBqQTHO9q76LYMSAZ8Ic0xi/E98wkA8EaEPQ6mA5ZkqQpixhX9dTl0mU9xUHC8yMcxpYBvprqjzBlDrTvu69JCte+dGlzZdus986SsQ6iKquZKQN4X6RawhyNuPBvJfYYV2jNC+8S8VApPsIc6KhbS+gFgJEih1V4pZTaRHB8tlFdbTnC1DCg8+lehXUJ0qh0gJqmNwrJDPIvBv1gZuDWHzwcEglsintzZdbHhgX9EjUOxYbeuHKnzVWlFz6kDAgHPy2naVZIK5LSdXyO0e4zFpphFbuSJI1oy9NsjKVWCGWLESpbNhxma7HpurxTzscHZ00vVOoEXoaWpoLmMDGtJRaRyGaFmlJlR+4EPMbVwHPMf0RYxioHt+6irYZQmm8RE5baoZKHUUJHUNo+aCIp/AL5zCAYc3dbpPH6oRp/rxa903m/EQJi44fvGNWUj5CuaPjbEZSoahri1Zmk52EihA1ZsHSWpa25bTP6FHuKc+D9Pc/ZRBrjckI8fqMxs59dBZcIN8DcEDHJ77g287ldsMi X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5694.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(39860400002)(366004)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38100700002)(2906002)(4744005)(83380400001)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(66556008)(66476007)(316002)(6916009)(66946007)(6666004)(6486002)(6506007)(8676002)(26005)(478600001)(4326008)(8936002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eksyc3ILSG75MMmUd4+Mby4515c0eTsGheOwutt6HfdwA68rMovJlSggPZXv1+qkIFz9KAyaqyjzpg7igWHvVMcMrtlSS0xVt6s7OErB1Sc/HRHDrm4lHygQFGrbwaSTyUrm3Qwfa2d5IM8FBcPorHDBiezRf3MtLFiWfmOzsPXPbqM/I64kxuMZJmsN4hXlAV5M7YYZ4kP4mSQVaen6oo1EyXp2O86tq5ft9Y3iSc1Zy9Ar2ogWU2fgMWnyTQRCLjy+P8nIYShNJvUSS4011d++NqFo7gOlB13VdjCNDQ2OqRTbD5Q24X1nOFxb741e/MV/+tvQIcaKBs9WbdZSKneyLi0btSR74PnwjpDGefotPx0XLGhnzRY6ixm1U5fyD6IiPySwvdAYdY85owX1hYwKt9/pLEWQNa1KkafmQqqCVfMkO9LqhpSGtgZ2Xf6GuYGQHOD6HqVYAtEiTPf43zJ56XZ7q4Up3+0aToUp+H5Kl0LwTqBHIblC6QNwejK9Rg9OGLrQizPedhO501pNPKLS99Mc8/rQBabitxQ96cUoM7Eh11TUQob3ncuEjNFnkh/ThH4sfTEjXcooH3Hg0ueYg/hlBuN+pGRztf8oQUKg2m3T3nyRF+MsPcndgPbOtem/87CcpgasGavB+pbQS+1VtkWqprxPSuQozLMztO539CwEFVToSIFMcI6pvd/qBv2fqQuNpS/2uNrlAd/xmuGM8MD3NBNuYgao2DW2x/0HJRT2q6KIXryECgcOeU9elV4QbqEDLmwUs3AsAfEwNCEHL63CNSAf6TY46OA5WiQw0oJ7PUCVGdl3bmCB0C6H8pgONOJOj/xIfbvuMmXibD6+GwEt/PfnE1DJgg6gZYw+2tbgLWYYTmgR1e/8YTW8O4rxwS1hJ/CPHTy6HuOD3a0ZswQzTiGABqJDvXvM3WbI8PURBcy3MjmwcEJuz2JQDrwX/DYhQZrnpvLxYWC8rgQ2zkU9W49WOQpSc+ZU0ODdowkJ4MufrwyfDsQaxuNMxHZ9x/TOwYCeV3PcRyhM0cN3N2+QWukaV3bFfCNVPOh5HdhnVKv461TUPIFbRGMitqmmmCbcsZ1XXDh89LkgGLOQMs0OBgfnKzQkIdPGItDNBMjE7he5Quwyxb7Nf/YtAxHUhWpe+pM5WMfSVcdokipeut3eZ/c4ybrZFkEM54kTR0eb5V/zzPAzn3yF0Wf9GFLtXqJBAnIqSVlbjN97WMUu5bxUjZA9Ci8I2+iTdZMl6kBNZFVK6FGTeZMRtC+APj5rm56v48KVWvCXbtgW86/7qhZMZT/1TbAcGzx/350BSXjq/vwxJgDPwnI4BCSAotZ+p2g5nXkcvn3qL5IdYC2/Njfc+BzNdZEnJghjLzldzA9d6whPRbU+sISGTTmYdFIR/33x08Hll/U+2unfTSF+UR+w8baWHT1xpfa9qAOdPNNJH0hjMp/7fSQKkjNnK4ZxHbRrpnFCLIUcL3lYd1I8IiZBs17OnJH1irPxUawx1CEPeI6u4jmF7fjwTJDxWyncXOxbKEVZ9kMcOP+ZnLTIYrubirmNGhlnI8cPlydp45yT7L1ADkKY8SFp4IsF7qZFaryG4EyB7pcFzvVWCw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2tSFYy1j+laVGlpuM6pwiAPGifxNQAFua473b8IcOrxB0ndpm+GfI4Nx/vsKIgk4BTtf66bUdKDxPythObuWbdxTdaUP/lfL7mVepidKihuQmZN2OdMsXiCpe8HkvUONFF4QBV+ngmicj2mhshAnH4HFJ/MeCeHeXmaVxoxNk9aiDGsc9PlpRZcr6MvMFgSeHzergdUlpMiSK0x5tLOmvzRaZ2kvrszoN3HlA33syP8udpt+F+mseCiLl4yl1bLx/Sk93u26iY19AXTAQgr/QoxYWeOfHubafOzjTWLyw0p/PB34WN+nJs2xEMXR9MQkP5Z4xVq6rYnDjlUrevQWBTZrb0NhHP2GtX9M4eDp0fAH0syrJoe/jRE7srOE2t6K4v8hywzNmA33XxpivxZUoNOOGkgn2St1QSAU81yWtvHY+pQ2MkSyGiP8YiiGfDLzoaEVSQciTeqBAjRcrU62BvjkdrnTVu39ezsIXrn1cI67eChFc6WopB7fWSWhGwA3lD2XPLLwcxCK8PiIDY7nqVu1+MzVWCIqT9XHXP5oin7jokF9Ueh8LifhUSDeMcW5cnANCcNR6oTogyfq9RcVq7EBCcp3La9pR3StVDWokyBXbJb8+0OXvcT3u3tjIlPjWY39DjafBIZdvOtKaDg8Odw4+/fU01Ir3uSfwlAjjSyr4nn2kNLR5d/jDZzRJ5H2Y3jheKNWCUlZUGho+T8wwBYREPAeX0LfL/2KRRzxRqMs3gpBX2hlo1Sdkod7wU7jTIjgM6O0rXmPjA/MBpEyYRzKLJwAdhlAE4r9KdPaAas= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ab3ee68-34c1-4b9b-d91a-08dbd952b472 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5694.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 14:15:44.2208 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xL6gUS0mtOvG0Nz7uI07hdQyMG0mK5xQ8jVpRKutw47424Dcxnsw9u7Wkui/zrx9POZAeXG63KJ+17gER6lpKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6127 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-30_10,2023-10-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 phishscore=0 spamscore=0 adultscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2310300108 X-Proofpoint-GUID: _enYi870Plh5W_ISxbosLpbYCEqmkT3A X-Proofpoint-ORIG-GUID: _enYi870Plh5W_ISxbosLpbYCEqmkT3A Add this test case back to the auto group which reverts the commit e2e7b549380a ("fstests: btrfs/219: remove it from auto group") since the previously missing kernel commit 5f58d783fd78 ("btrfs: free device in btrfs_close_devices for a single device filesystem") has already been integrated. Signed-off-by: Anand Jain Reviewed-by: Filipe Manana --- v3: A split from the patch 5/6. tests/btrfs/219 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/btrfs/219 b/tests/btrfs/219 index 3c414dd9c2e0..ebebb75f4b1d 100755 --- a/tests/btrfs/219 +++ b/tests/btrfs/219 @@ -12,7 +12,7 @@ # . ./common/preamble -_begin_fstest quick volume +_begin_fstest auto quick volume # Override the default cleanup function. _cleanup()