From patchwork Thu Nov 2 11:28:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13443619 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 4ACBB14A98 for ; Thu, 2 Nov 2023 11:31:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="oxx0lo3O"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="f3S0jUxo" Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E6FB133; Thu, 2 Nov 2023 04:31:04 -0700 (PDT) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A283NN6015629; Thu, 2 Nov 2023 11:30:58 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=ETT3ECnU3VLMCZGwI9susN4oaZNX4CFpMvdIFeHFrf4=; b=oxx0lo3OOLrLehF7AfTlS5HKZdftOoJJxdKVyg+9CIB5r66Aa+ORIOW1tfhxA8W+suuA rZ2hmDqQ514HtY5dQilu+Ep24Ria0ujOmi7QrQ8x5tFQoBpLPHsYNHz28kVO7x6lTrZC pSEZDTDpKK7KTGgaQQdwT3LXvf5EPauu/198lO9+MyPVIUZkdNTYZ8pK28wpwHhcSDhV kebQixCuJu3Ds7sgRiW0/01djKkqQkTiMndMdNuZuqPNRsu4ma0/AbPx2Jsj8PAvrpkT 5o1Enq+A33VPicGXjibSv5ZMmDhRk/RRi3S9WKoSFKpVOzW90WaSRWZBiUB9eQ48vs7m ig== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0s7c1fy9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:30:58 +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 3A2BEJ9p009117; Thu, 2 Nov 2023 11:30:58 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u14x89enk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:30:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KJ7mjjeR8gJXEZLnYhrqstixohIXdXEWqZ/6F9owd3bxkB03F7sl0nOTCTIY/o1GqfAZBsQjgQKhgynK0h1xaXIZnpwQwlHh9cWpSrhPQ/VLSix5nhlCSBr8uLfOfOprYUfCoiqbdCVLqvwzNsQde47zzsbFaBJ+hGLXa6DF68+7Rg6/g6MNreUK1GNelWLUI0CR6sTKnrBO7D5DlsRtBKeWmrACQqkdvj0uyLkHPdddyMBz4+knvj6LQM4Bwi6XV0Po+UtvYVdJZFd6cYwP+FW7/+wAuck7Dpx/n0tP2MhLGxV7q3Vn4K9S7bgUqNyquUOHzqq2jG0CWtacbKbHnw== 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=ETT3ECnU3VLMCZGwI9susN4oaZNX4CFpMvdIFeHFrf4=; b=ByHxTbzjkQEBd1VTBiIjA861f84WRvb11ADrk6yu8tyRNqClfji9c6pUyUPkagjonqU6Ynwan32l46GSw4VPObna1CPyBYN3hepr8Mp+itOKsqwedfJKX8BLiQ0a7eAERjWS4EEfNGSH4GzEivKBjgkxpF4YuEd4ByAq0m5GLvga3Yr1kw4bBanvEYYDYWUrAxR9u9PvRFFTDqvkWCLTay9MLOeirEGqJQGs2ZWue4WFmt61DjJz+aviCsQ9g5Wci6tgZ7zZ7EfDXt7KIa3kmdQlBMS5+rMMjp/tpEmh/DNWUBW886NuMYEj8NfdMH4gNCDn6DFFa78ENXoFN7XEkA== 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=ETT3ECnU3VLMCZGwI9susN4oaZNX4CFpMvdIFeHFrf4=; b=f3S0jUxolTxPQBS3KMAig6I5GyGFs+G0xCVFGzcFqLbL1FpAh5NGofdmw1JQX0GMlm45cFtN8+J7fyGNkaLCJRJxat7CuOHEoc+1KLszHq4+Gp9gqYRYV17ZpS8BYtgFs/AKxi2MmjQZwzYDRla9cdY4Sp5Lpd9McHDIiJejwXQ= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by PH0PR10MB4552.namprd10.prod.outlook.com (2603:10b6:510:42::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.21; Thu, 2 Nov 2023 11:30:56 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb%4]) with mapi id 15.20.6954.021; Thu, 2 Nov 2023 11:30:56 +0000 From: Anand Jain To: fstests@vger.kernel.org, fdmanana@kernel.org Cc: linux-btrfs@vger.kernel.org, zlang@redhat.com Subject: [PATCH v4 1/5] common/rc: _fs_sysfs_dname fetch fsid using btrfs tool Date: Thu, 2 Nov 2023 19:28:18 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI2PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:194::15) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) 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: PH0PR10MB5706:EE_|PH0PR10MB4552:EE_ X-MS-Office365-Filtering-Correlation-Id: 423c55e9-2f35-4e0b-ac6d-08dbdb972df9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eSRYs1pHreLZZ/vJuiF+NKmrwHFouhJGbKm6i09IHox1nB/D8+hll5H4EItThDiuR2q/jin1iv4PwjO4uypAhRXarPjZ296WSxPfnqGlHiDA7ZlSgNcSa9vPHUewfOrtjyTqEMNyH+5AtXqCWY9dRVkA9+RzYvWJrxLVrYYkQ3O5Kk41AFviOjfTnED6qrFkjuriMx+Sml4usYGwYcaAeXn12YRGKVTGEX2N0T/CUpBUjNuMW5HKHN3LULz53LCRsIZKlhS7fCSPRKjJ9TZFc1OFZU+rRH7S8AzDTpNmE3FS8IxRxmCDg4CpfwgYWuseqZSyONY8kxR+WnIGA+Gxt4HxCA/00u/j7YJfSufSeD9XWZjTt0RJA1HJpHq/DzcTACyIo0yZPvd814OHQtt8BwnxUC+E64zKD53LDY5dDCYEhgIbkpAwubRdjVDEOuqx+C2fvObwd/QEmsVdXVC8p6SJVWeNDANKN5AkZfpxQuSZBZpnbUaFqxt0hgiutKl9jR96zKCwBfutnZdMBm0/7ifoSXhIy2LiROdZR/vwPRSRjq9jrulsrjyxF4T/wAtS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(136003)(39860400002)(376002)(366004)(396003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(36756003)(86362001)(4744005)(2616005)(478600001)(2906002)(316002)(41300700001)(44832011)(8676002)(4326008)(6666004)(6512007)(8936002)(6506007)(83380400001)(26005)(6486002)(5660300002)(66946007)(66476007)(66556008)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s1/BQ+sUxcYfu0LDF9U2W/1uPr4IJjLPjLvfSXoNAOxUHG/EDydUZd+UwlCgu/nQEiXTHS9i4ok37g3RcJEzb0UxPCn0A8evK4E4yEAIdRH9wBrBEyZQ7/3pU00DPoNmZDjFF0gFS/fSin1LNqeUgccKi8723BZX7HYxVoDT7uqvCN2WGV4T8bQQxI7BXZ2/QP8vbWJwVH0Q6SX05byYqaQPk/hG5GVvg46NncIeucISX3a6Gzc80g+8KKF7ZM6Jl1oJgcOKjHVpcLv6s3Ur75F1/ieLqLPneYu5BG+b235ZL3g0fQmsposZt9NffV3Mt/ZVmis9o1hh5eJ2fZd/vPlYlKez1akGdZWy8wGhjju3YtN7eDraYVY4n8UNzOu4HX9eJrZxKCwNEhT/+7uItFPFKgt76QqARqP9FlQbmQhBHjJu6qDsQsnXNyNwCz2qPtoyA4Md3WnAu9fUZMUQe5vRz8ti3Qa0dT4CBm0880iRbrkJCPz3MV7CEjHgxssy9DUdL9GtUb9jxNrN5QBn2PsHUQARNDVhk6AePQ5g4JYFveTpxaE7vH1DGhX1bYcaFTIFwfMucqRtPUtT7/YA119ZjL7b4+rk/ivnVMAyOMyxusPITZZbBLQpsVCsJNK2H5HJx/i4jdJ0cAcg4roPQzZSww9Rs5qk8Bw1tSk20tgorqV9EyDiHwPNo1PYzOtngMmnKOBR3sD2Xymrw5cOBPsJtlq5azYZ73A2By1iEDgjKng2Xry1B1M1jCSgCT5pJGjopUhyXOCsW2E4lLqbtQUmTMjdxcK93MModtIqAM573sUCuHiPymKsdoM9Nd5tjPKwsqswYlnbYgTGybm+ohgWcwuIMD2TUrj1Aft8NtJJazXRcw95ZiApBk7HvdrgatifoxgBpn5XxFEMxxEvEgfNtgv64Qg2dmvD2RFV4D0xe4/GQoKJvLdj4U+fuYxpkSvyJjn1TOh9KXlXMIlEIY3ehR0oWjSp3g8I3NypzLi9KO7iFZ+AYutPkObcnht8V352fVLtAPcEbfxoTzZpvgMzv/OkT6t0HPJtsNaFVu74XNTPaTGHCM20bK8Zi4vd/98J+F0E0+huaGrmdIEbOsfw3ovTaWbCvO+hHtXkYQA4fQ3w2Hb+6ZVQnktvI6tIdapQORicqy18/M75fS5Cyf4L9J+5ZT1BSUAyfYO7nFtez0Dx4FMS0EJT13J2ZN5s0DmS7AwxZLoUWOBNDmae9wNI/G7XiBbYbeNw0DRD/pEvhbIx9ecUkYV40r1xqpmZeLtmd9zyVyciw6k1nuBYW6MWT5SrTczG4qgaEkeOupWpAb//HSYcmeuVe1FQCsyi/iX098gzrYiMJSm69xVMhfxNVfHT/5Zo//FBkPa1yvgOrdPdhzisjTxXiRKUxahmLCP66r6tteMwGyybpxMizf0AbcnHNWB0f7Sk1tUa1Ja4WuNfDudcdhElLUP+1/sfGPblH9k4WmQUW2S1jwq0+Nya7uZMkuu0g+pjDvor877oqjaeWcf+obmklpoE9end4Sh3exgoLDbREp+xTQIob6XXcuPPFAB59kqpJF+LeahZKIrKql1NGresm4mlFU2c X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6fHI/rGsa2qa4qkGdxI3gWEAXffAF7lDOL7Ooc/vOkiLVJ8ELGTxV6wJvfD5E3H/V0IpVOm3wsyPQU0RB+BxMMOaAti1pheYlqd/w0hc11D8XD0tny08hpUTOgSZOnuK/CCuTy6pRLZ5wyW34jmwSix967jI/QYc9YUnCtc8r3W2qzjm0v1+kv+O3MmqCRTJdw+fndxxZl5+/0Ip46k4juRF4IhD/24JdYt0b69dn6FNPYLaAJR0EaLDBm6eZSclEFcYil7E6TDzKSqdZzTxFIGkziBNsF5vNLAxoFLdDAhq16/kGRzCrjcusPXmMw8GeQvdaCXRF3yZfIfAuNxlzEaZpDWUllg4TXrmlX7Lwz7+UDvgrZTD4pmdhRkkvjwrJxxxK1lq+LlQdwjOh7Ghu8qnNYPw5st6Ci2Rx/8Vz3K5fU5LZGFlKiKcxdTrjNrC3Qc1qBmjSuMY3y+rKECPPVMy3sejF3aVBqpwK26ct5PJho85a2jjBXPFuDk0AC7C0CQPUGE7zZ0aDg3qgknG4XLAg/FJCTuSLygNjxA6oD+AP5y063EIj1/rUKWG7UPf/XPKDKaLBtkWvf6KrYiD1MOTQeULakzr2c/rRb9hKbr8yHx5QXDU/xta7lZvD4HM0uMhvT0Q8A7eAjy9Sp0ZD2/RyfQFIAl78aoZCHpGSyxiLXQ8pSx83L8zmajM/GXT8/0MMqUsRXntxPMDKym2ZgOHXV9CqYAJ8WaRqM28WcQX4LMoV52r9/W6Ia5BMwxltUbXI9jf18g7wTNsotgzIoqF/1NQLhowcUI587IRkHA67MRB2Fu46YQoNGqvimQR X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 423c55e9-2f35-4e0b-ac6d-08dbdb972df9 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 11:30:56.1890 (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: ANByid3Q+JX8t+XwgPtEWXAqv4uxYXDtJWVv/Nzco76vXgPmllFatdLJ10n6VtvpTptPOc1uXsRsj9jlkxCfFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4552 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-11-01_23,2023-11-02_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-2311020092 X-Proofpoint-GUID: oKLW1fPckWMEkSfNSJDGfMIBgumEgzUJ X-Proofpoint-ORIG-GUID: oKLW1fPckWMEkSfNSJDGfMIBgumEgzUJ Currently _fs_sysfs_dname gets fsid from the findmnt command however this command provides the metadata_uuid if the device is mounted with temp-fsid. So instead, use btrfs filesystem show command to know the 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..7f14c19ca89e 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_PROG '{print $NF}') + echo $fsid ;; *) _short_dev $dev ;; esac From patchwork Thu Nov 2 11:28:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13443620 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 3DDA814A98 for ; Thu, 2 Nov 2023 11:31:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="dgN6quGv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="iscGMGaf" Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 055D7130; Thu, 2 Nov 2023 04:31:08 -0700 (PDT) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A282r1J015422; Thu, 2 Nov 2023 11:31:03 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=eeeG1OqACfPu8tmMjPO0rbn6e7yWyy6LovRTeHjGZ/c=; b=dgN6quGvJNHAWauMFc/1ZzHqgnFRczqf3GTwh8XiAklURoYxA4fbzf2j4c9C69BFreaV 0QBBUjLIewfdVF5KXR6XBWFFtuWIdWNF6apt8WrUuMLoij7KFWr6VEUp+p/5XTbPH0SF WOw6wq+Yc/nQbBLyhr9yFR5cnmo6lJ5lCfJsZ5vFcc+uH1jhpcN8ypLm+yZ8EIzFzEPj Z+Lw19h6A154uEB+8LVxdkt2stfFoMXuQgLprhCvYRk6hct1WQVAcV4CxIRJtXVdPW+D jCvCefnIfiMJUzHc2gfJHL0j8JPRB2TGu6dNq99hPzbHSCSBkNvUgpXtyvlaCTllwg3k jQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0s7c1fyq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:31:03 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3A2BFmbs020100; Thu, 2 Nov 2023 11:31:02 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3u0rren4uq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:31:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A9JQ7Q+0EvwhcVgg7xblJHTSQgbOaRENR3iGXSqav4ofp/vjONdvxzNkoMmH3rcWOqNt2Ppk2yEs5gH+bkihp3MofCABtTK6Kj3El162qmeUFMU+4UnQpS9JHSuvuYkt78NyGts10YTYo/ojcfh890IEqOF4gSMf0/o4LojmgPYIdj0ppvv2teHBpuKPC97skbgojYz9OtnpL5bZsFaMTLfR6/TG6p3GPMC4uR3iOj+/JwG1EuO1fe+IBvVO0AEnhbfbCKyoVqr/Pmo4EYZCywM8AiZsK5aT1PZFxg+QOsHqutG1GIxPigUyYCPeg2kHCEp3j8DEIHGgWQgF2YcXqA== 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=eeeG1OqACfPu8tmMjPO0rbn6e7yWyy6LovRTeHjGZ/c=; b=mIP+VsuHEz/yElfOiftgJxSFUeGwzguXObupRflFlHQ6U+QjCw9yiqS2s9uqeWNeQojuClTPd6me/OG4a+MrE4BcqzdGW96N1WXTbAEtVD6d64OxB2/knCaabP0H6JaS1gRAoAj9Mk7AUm3Flog44wqfgcZ3aXJd+jP+AC/Z8h2hq+NxoIFZE201YzQiidmbtHjyJ5hlU120oPivu0Dj1vCnm2FnS1qA/EegKiObzr4xLLXizS4qONs9+F2nabuzxl9RNaygYRq0fRQB9ER7Ls8UnCJGgWXGhtIz8qUVYWVYIHp0+/U0RTzNzg8AaX0hmqwXHD6SOtosVwN/EXoRXA== 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=eeeG1OqACfPu8tmMjPO0rbn6e7yWyy6LovRTeHjGZ/c=; b=iscGMGaf8oB0E2dQi906GsbtLMQZXMUXkSYmgZnGSqWb+rRkDOtIjYoRpgUAbIQX2ttWRUgqTQFa2rBkcM0zgIxWR9CRbMzxURm2xuJOF1Tu0hSetxVv+R8EddJVQD0GxFpu59HBYGVtLLmmbtaYclzsi/M1SQmwYmeq9srP8Sc= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by PH0PR10MB4552.namprd10.prod.outlook.com (2603:10b6:510:42::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.21; Thu, 2 Nov 2023 11:31:00 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb%4]) with mapi id 15.20.6954.021; Thu, 2 Nov 2023 11:31:00 +0000 From: Anand Jain To: fstests@vger.kernel.org, fdmanana@kernel.org Cc: linux-btrfs@vger.kernel.org, zlang@redhat.com Subject: [PATCH v4 2/5] common/btrfs: add helper _has_btrfs_sysfs_feature_attr Date: Thu, 2 Nov 2023 19:28:19 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI2PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:194::15) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) 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: PH0PR10MB5706:EE_|PH0PR10MB4552:EE_ X-MS-Office365-Filtering-Correlation-Id: aafe3f8e-1ae5-4a24-cb91-08dbdb973060 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aPmenXBY92Cr4KIwIq1Z2WSbv0x7zUtlpu5hkHDgKD1owBphuwW0Jz09QyZIV8HYLcFBy4m/M/v/lP0xuzoAntIPrpfhfzZjlgYWiF/QBxSVZo0TnGYDN4uJflSfzbqiWRCURfWogNTurIpzfYuDYHAdfjbcNauGFHf9UlyzsM7e/rnvPuPCSITdO1bw+UMWtts8PzrWmnMv7BrFpvFIu4BzddCS7tIB/DVzVqrfugsbL79IywPfPE5gNegkzyAXbLaaDKv6Wc8Y1pXwdn8ZWBjOSzbx/nWfGp/KQBbBECoUArsghnzYNJwhUAYm+Z3pspzZMq31uIEdMzjv9f68dQsALra8PMTJxi9sr7te+bZbYIUqquZdP+9N1T/i57ktzoAR8B3xflICTo1RE6naflIFlpGOnnS/TiXICJsC5cF2J8g4lbc48HiDw35WjZ6k8Fs9flj36J8yis3CZP8hczm95MYm6TYPjnI5jPhuQAOJ1PViKFZyZMtkleXMiz1KD/xRkM0q5YP/OzZVabpY8iasQK/pLh1UdJz+heLMiq5OLcJFZ5d1dBkQA4kbnr6j X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(136003)(39860400002)(376002)(366004)(396003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(36756003)(86362001)(4744005)(2616005)(478600001)(2906002)(316002)(41300700001)(44832011)(8676002)(4326008)(6666004)(6512007)(8936002)(6506007)(83380400001)(26005)(6486002)(5660300002)(66946007)(66476007)(66556008)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xeEgDIYFbzmOUKoEAclSTzcGsyqq6bc7gK0jZvLgN14BRQqJ5+MxRPwCBjN6dxmNNQWo+bXcsUYmN8Xd7OEEz93GuOEiYZfZgZU5CWh/95BXfyXFrYEBwgPgSWF09mxIDObB1fQUy7DE5jzHdjrwdISo/wa9WCUfR+iiou0f3HL9RJsYcHt2uBu2DCPPn0jA/OKiGiNF10aKpDxJFBYyGdq6754n8NurACWZ9mpopj4R2vmg/fBXmf6hR5Oy8ahSZSeJQdgsFLbuPf1FbmNPJaFoFqPNJl6aUznWgxY8K6ufiVxXVDzXY4rKDK6V1IZKhT4TpqTSsQkza3Szk+HwIoQMPX6KoiC4f330g90upbt1646roMVtyA1/JBo6l0YPVeI3FUq5gJKE6SixwCFj+JXXNhNN07IzXbY1R68DgOij6W+b1PGKYCiFzBh/FfK1Hs3II8WEj3HZs46JJZ6QAvJUNWJUG6ueC2InUDfrjN5rQlk5fw4yJdAPLiHAyCjM6lKmEmIZjR63k363MZrKt4y3V8lSaNyehTIQ0jnQ/TxXUpV6GxkbjHlUhTOhFXw/TWwunhwmC93mcnSPyV9415AYHWT9xTNKxACHcI/Z4VGVOO3bHQmn08kgWTPBAAI6TOMnDEIdY3eMs0DmrKId4NWXLptEI9ftGd7NHg+ZqXz1ev4TT8bfrzdTNViHC1DyJj8SfWpxO1jYwsC7rebw0PFgJXom8sKHieSJAuiqT3ANO3zIRBLlOsy8IQdwl/a0OvYczRe/Lz3sDwcG2apDYqoug9LSE3Vvzq16o+EWJg3uZl4LMOxveL6MulGHk+uPzdVZ5/dDRInKiu3+aVjQcpyTUs61Dd3T795iFlT38mp5SN/WYysHeQpyuEkcKs5XQ6RvopQK5VlRetGlChcV/zj5GnBpIOR1yzPn4Erzv95cRhNNmSV887xoPCPR6w29+FqSsViaRp5j1zJoq7QDbr/JgyGFuYKOdg/lEefXOwQCi6KMIKlJS6Ku2TbIGnXZQ5BOetKTWRDUpNYEt+dWebfYS/zXrYkkOVstbbIHnB+v2n8zmLE2ULT8lR7wKU6sk/nXwcyaCRO+H1pOz+i+UbCPDi2078h38POB6g3+rmjwU0sNjjGP/vISyC7Kzq4JF7K1RKjoP42D3lcXIY5LR/ci0xU+5b51gQ0lSlBkYMH82SrJ9d0Nd7cW6t0gZf4uoeNC96CAyPVw63p8CCZMt+peNceTj6c01xPh42XjZ6388f1QSNN5MIj0hoDT4wQSVSthpir0LXNqP/XJhe8SFdZZBMmwP2WmcIjJvQ5H6ngeFQl3nAyRagxCZepIsJCr0N7nAFTiRi8pKW8tC1V3YDmZmm94u/MXyC8lFMte8RViUj7hM8inbQTqrYJcIbOyVYOV8wF3cf5Z2tim1O0tab1LyuKuuirbiVK1isqpxhqS1KZ1EQLW6vuZMYqDUsR+O7YLLBR4MKqyy84TW320OogCYokMZwjAQKtNYP/aRg6KMSZVGJnUkc7q+/DOmRyajIsRzymQxnw9S27De3HzuaMABaK3evTqeyy1cp5GqJe1i9VAtxIXsTM1A3lpsPG2 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: yBA1HSzkQG27zna9mccjmJMlQK6e/7U4xZc5vWKmBSb+obUtrZnYzi1Uc8zU/crMJwH50JN0U5NpMgl1xIlhd5CbM//NPx/3fgoW4PcL07mbqI8Es9if2c/76UzX7xVLGCdfG4QRH3TA1rcK4dT8HSgOv+HuLwst+/Nt5zCFW9fT/Ic3v9q2zSDfMq5hC+OFUh3osmjsxzZpumpTZ9nxBPgPzxZYdk5MEhQaVGPEpUztcHR9FNSyIonFvVpnBF3CAcDcdn7GavzJQ2iJN50EYOuCgvHU7SSNudLILTSqgrqvCRcqpZw2v2BbQEHoLhhMGCJ9y/Xs6gl/ou6IBHh7nXZAJ71uo4KzrMwrubAlNqibBkMIdFK3kXKTTmcg3vfadDqKYAjxXr2J0PRXPcSkpKAtLl7Xy8Khgu+aolh8UrVOobbou8gXyCAVkPhm8+EDr2K/QUXks5w/mSodbz8ODDitxf83bT3+qhEDFh7AIr8nb3J4mcZ7BUGEHWiOh7eSaz7pqAo462/xgXAklr7DxYfFsToDdnZGx67BpwROiGma0yZmQYwbvB6w5rapKRJVUH551DIQQz6OKQqICTc55U9bwUkMEdnxkljKMYm5xUrrIg0rzffrl6X6ebMtvipf2000SqzR3fRMP7uKl9DhySr+s1GC6G7Pc8itUHp/JP6vqu1P79nH30/oBd0SLYqvRBwQ5dxhpg0NNPFCiPIqaoWEqH9VV2AjJM9eMq2+y80eI1KxjllTnLQ/8MM3s2wXTweBm2fmsV5anQnBSQ2WQ5gALR7+59HmhI1m0UwnQwW+0q5oWKdmrbEpsqXESr2/ X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: aafe3f8e-1ae5-4a24-cb91-08dbdb973060 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 11:31:00.2176 (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: h9ossHcmsiDy5R7BH1QTsn/mVqPiT25/Tq//UUdeiL3olZCoOdpYAl7o3PWDqkCt5MrPcqtVjBqFdI/ca00L2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4552 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-11-01_23,2023-11-02_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 spamscore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2311020092 X-Proofpoint-GUID: 8y69YSuNpEkNYTatB9SmKBjV8EwESiLT X-Proofpoint-ORIG-GUID: 8y69YSuNpEkNYTatB9SmKBjV8EwESiLT 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 Tue Oct 31 00:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13440960 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 64F5836D for ; Tue, 31 Oct 2023 00:54:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="d0m8u1iV"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="q9sGQBVu" Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 037139C; Mon, 30 Oct 2023 17:54:33 -0700 (PDT) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39UMxGuX001844; Tue, 31 Oct 2023 00:54:29 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=Su6pXe7bktD4nPyuUmflLt4bPKRQbUGWilff2RoqTNQ=; b=d0m8u1iV++rqHbCRnxp/sf65e77aotY/PmVzthI2BrwQyA0IS7R42kRU7l7DAz43DzOW mi1cmiLqfkpzdEKidnfhPrdTx8DPVbI37+pXeu3Sv3jG7gcftfpt/6saJpDve9HFSH4w bulyeLhiFwMy2tHSUwro0BxxBvGyhqaC9gESh4BS2VFNlta3XIHF/r2yL/TbF93bM58L 6HVhxPMvkxiuQtLTbjovbObwlYWIZc7rPG+f7TyyCK4/yy7r5ogxnEQiJkXA5uu70C2W xx4Llb6NoTrGciiTd/w1nvZ/zK0i5KuBjK9V5BVzbIhQ72c/4xxwL9xK1OCu8k7e1XIQ 9Q== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0s7bv0wq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Oct 2023 00:54:28 +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 39V0MSlY009234; Tue, 31 Oct 2023 00:54:28 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u14x4vt26-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Oct 2023 00:54:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MJ8Op7/KL1ZFujnwwmHfR5+c+D6WrZq8s8QWYTUeoVpDxGYrcauHbWAxyqfY3LPQz4HNWAp5Wx7JlnvopLsuNiQPUVzk9RilInUKEt/9pxiCArfb3PP1ghOqAvyqAgRAe4JxS0SWOxuoGnPo/hNNX14I+J5IPhCSZk0U2ejM6vZ0E/FB4BATBbypZaBrYUVp5PomQl8cu1A6nn2VxJX6fxCrSG1YncBVLTqI44u/JLaR4LV9Wh8pMn+Ie+9uWiaMPXbpqyjyqOC5C0vJIMlaiP2Vh7GOeE8y5rU8iW5bbgOpzz4HG+XY3KIuInMtj5SGMQuQf2jHW4ala3dm/Ts7kA== 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=Su6pXe7bktD4nPyuUmflLt4bPKRQbUGWilff2RoqTNQ=; b=TvTy0lbUu9HfRku6NJkAFQB0U1g6VE4KwJSoiNiG2qY25FItMnUxX1g13yVyGKZqzLRWYUS3cxUe1QB3jj43muSlU/HU5FcWq5bSCp6BFUT6sQhvNQ7IridGCAanqlUUKUBs4hYyGcGGTJURw9gmrjgWxZLMEBVT7tI9SERU0Qp23Fkm6YK7IMfejgj6ohgoNJqs5DjDfZ9jdxkR5iODLN5sGAWf3vvHXo35Xp7n1/FkiNV3zUpZKFfy+raB9X6QZAUjIPMu6aMplenFiTelzgvQ+IkDS/FmKc5o1UyOQC11nqc5GMpviC8gMk4MQJyE+6HF6pGn5iz+UN/JxGTr9A== 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=Su6pXe7bktD4nPyuUmflLt4bPKRQbUGWilff2RoqTNQ=; b=q9sGQBVuwDr+LsiaWnu9Liz0ILsB/BiKMIn+XWeBsklaiNs9NIbuocdrYPlsjl5MqTt8A+ftOZdHYCrNX6Nvq9zSjM1zXQDbnXYjgcN6sWepaG18s2xFW/Ia4U/DnPLxVkDeiSLzYBXzIqDvA/0Hb2pNEPMcVe5O9Vtk9+gUti0= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by DM6PR10MB4169.namprd10.prod.outlook.com (2603:10b6:5:21b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Tue, 31 Oct 2023 00:54:26 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb%4]) with mapi id 15.20.6933.029; Tue, 31 Oct 2023 00:54:25 +0000 From: Anand Jain To: fstests@vger.kernel.org, fdmanana@kernel.org Cc: linux-btrfs@vger.kernel.org Subject: [PATCH v4 3/5] btrfs/219: fix _cleanup() to successful release the loop-device Date: Tue, 31 Oct 2023 08:53:41 +0800 Message-ID: <77a360863a5d41d4e849fdb829145c6591d4e955.1698712764.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SG2PR02CA0122.apcprd02.prod.outlook.com (2603:1096:4:188::10) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) 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: PH0PR10MB5706:EE_|DM6PR10MB4169:EE_ X-MS-Office365-Filtering-Correlation-Id: c81e65ef-a3b3-4e3b-30df-08dbd9abedb5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u0K21oL3tGR935RjCyz1fxzKbx3XDhakcCh3IMls9udrL6kBITGf8yKRQm35IbFJdJdOYF9mZlaOrZsVp7P6yTSlOeSHV7AxXrDEWZFFyF1k2gghnQ5hFoIZbbdnBgl+LLVoHieTt6wp3+PHIFVAsfK6TofIW2aTZRRui/eLB4LstGckmdKIAVmoLB1xc7dKAUFkcWdtGfobVceSi+UxtXJqtSNhvE3uidrkBY/q5x5aMm90jzUJ5vuJk2ZY4bOk/msOj+toB5PxJgmCoaENNGlpkLfYg+G61AIH2KINWfp95nLx92HYa6QUmrbSLxiJ+JD7IuRrcEB0A2YFAN5KEvfit6STEo1q4eFTyeJNVh7sUbpnI3HjULQi4bcV1WYxMEcep1W3fTE4+0ncZCu/GN9HanSn+6szxsIKutzxkvZ+Rdv8fnemNmBaV8oe6L3PIdFYKAJiKmzTWPZW7f9qAQX0Z0IJeLc79NpuINQ4otD0ZgPzRBUWTWqSZky01dinOjEUHeBb7hu2RBDpNoU1+g2fumqq+1lU4TCqtxgmy80C4kPUBUU70E+UYOQVGCQY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(346002)(39860400002)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(66946007)(44832011)(66476007)(66556008)(316002)(41300700001)(8676002)(4326008)(8936002)(478600001)(2906002)(5660300002)(6486002)(6666004)(6506007)(26005)(83380400001)(36756003)(6512007)(2616005)(38100700002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6dLAf9oFjlI1GNlctWxNltigkta1GBpU/HkePuquoRzoiqPpW+XKXtfg/NnXeDG4t+5z1OBxY2K5Z3zt6vKuMA52Feh3cKEg1jzCoIyurac4oWB9i/BrZTc9CEdP6pyddmJrjwR0jUFd4omHFhRKL29ff9Ubr8TE+gIOBysxtrnpSYQSSuJISpmX27jdUqTE1x6A3F1ZdbvmNcZLJzDc5v0SqJ1Zcz1mnk0u78kOsJRZfB5NoHA5v5xbmFJ5GLuZVlD0PBYE7jTU3fOvI4/c8tww/unlZem0MnDkMq47dY3y7ZwbdrzgpecUH+Z3yrl0DF30ks5sG/4iOfmU50sfZ75Zux1WmUlY0ficK8jXavYMXw+EyKcoCUsqC2oQ8p9vKMHtmhuH3k1SdOYFfRwYsanlNS84Kmuu6lfp0F+aADWQSed67BcAo8qKEc7OrsdpNNXbYjbJBQk7+rO7noo/igEDdaHBg1xk8UEC0/hLREvV7h5moZzAYC2GiWSwpYablvHXD8WfKAl0ITXrY5AqSxLKjyp+nZ/paU+oruZHndPeTQ6yd/wPMRI2qdRrYtY92fhU+n0UfYeLFKTowoPweo3oIxgYKYqUXlCKDypgh1sCz13YRKmK0GmcXaKg7rQraIde0YVO5lcCaC+SSlTnLlXWah2HlYlRipT3K9lJLbg20G200mHt12Z4opAc0u7QyVC+24DvUJhWSo6ltqyuvM81mxDvb8HOi4uiTQ0/CDTlaxpILkb1Q7tdD4hvlvzVMRtDylLrAZwiq2Yq0seqvF5P7Ghht+gQea/hBZyJngRYHqg2JYNWHzT4wwkBJ+h8nXwBgFYlhsh0pE4T5+5MA9SMDo9Wwz7+pxWVwCneNSXVtHavuA3Juh7SlyddmeuR+EqrbW60Kb442pCJJZ9V5qrM4g+VpqMe5T7FxzuqcZ8n/5jKyF6qySdX9V6cYhPOomJqhnvZ2T99ICwgWEOmhq+c0zqEfdx3t8SmCzdRZcaeJg+Fdlk49One24NRrdjmUctDjKF2gA/CwCXNsAwR4ioilp77hYG5RPUG3GCIAlY70GUj7EfNoaW1Po2nfZeD5xOilsQECDB/+UmU07bCK3SqbaYJBq2WdTbYC/b5uE2koDwoTQbJQHyXyxpJ5pIMFJi1EBHNzAMzQ9zfKFLUEfNBmFHTbwEKOGZcNwX9D3zWPAYw5zBaKCPTIylrieb406HHGVlF/SlfO5VZ1WTJtnqM0dM+MfyHyOonJM+p9sheSMdYtZaqnjhH7ltzq04QAwonK5/ZoSKVD/yame7CdwjeNQqZGaCIea3MXASmYlFeJcgGkdCJ+dZ6GZhshIwmH1TKKQw/O0DEOZnwkH6LTOOwH0Qvz7uaPMW2uax7WaJFqjED8e/lFhtCf9/syoo9hNqAwKbM4eJ8RaVGQOPMJoq7jMDcKOUeYd5WcdEWsc1CvZ3XiupTw9Zyv+BqVL3l1gMMEBiBhsIsvm+dnoOpgVj0URXrzPFiiGbYMrfre0pNBCCJKdMmVXXS5DOTRpUgkh+Zka4ESSrTi55fdej1mMgqDt9uV6w9byf1huywSVej+Zl51EPaBpR8W0vGTFJ8A66NgaBYU69NRCn7w6kbmQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ymrTVYa/8GeOxOaJ5rj1dAyYj3tH43HyXr2kVIq4x4ENeRFHk0tY1L5iZkHlN60wgboi9Fnjctl4SSpMYPAGnHFwq0HdkaLjBr/IxllKWrlSUIs+tC2gqWT74bU9X+7JeEFncw+r11sr1a+mXBB22I5NTeC9iPDPD6WBB1WhP35s40mV4sOyqdecr/iW2KivdabHEv409QOd6mbAy5+Kxy8cBmTx3Yrm79b5Xi6ZzNxYfDOOyC8+9dbgrIkVWJr65fkwWqtsL2rhhCcMEwCatxgij6duL2jbYPIbKW8GHkOEfV1wUtMyOoiDpbYTNN8wERc7JCxjMLbh5wk2LWg4pS2Ur+4f4PrXDA+Qac5UsOgduXdKJuTTNiUDviI+tk9D+RuVCIGmCFoOh7feN49FTsQLL/aQqhXV3N3vY3pn0kE6tYeru4MSE2qRJzUkHTzr85sBXP0TvqoGFXi1qQEsLD2bqEd88KsLBPloi57sCzDibDnI3h5O9qzjclC5hd2tCF3QdhMnzKBV+EWfSDgaWOyS5bV6Mp9WqkekDQvXYd85l8KBuMEtmVFukf7CKl1gPVTh09afImfiIidhZAVNRN7cCxy5jyrEsOtYzbzodMPBypxfarWr/v+QZuQM0nKs6O7Vh/fJuUvblZc5NWFT/KJ+NwKCo5qdBvUK8kiE2mjrbDXtiqJE8os+YzTdVrgxpel5iX9MOBtkQ1/xCV/QTobQ69k5m44zrGWwbNMkipv+ygeAJzNkmpCzsc0LlGdRiYnjNZrPNDSzs7f34j5e92SRzJN1n0KjihaqN3+7YUY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c81e65ef-a3b3-4e3b-30df-08dbd9abedb5 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2023 00:54:25.7136 (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: Mp0h2nsS5btyI6/nyf8ub9qO8G/OYZ4rLz/iO5dfMhghgdtPhJeKLNRdKEOB8Kh0FryZvrxjtgaTttWyDGWzRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4169 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_13,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-2310310006 X-Proofpoint-GUID: y-nR3mN-k_JZlf1vIJIq598mBROOtOsA X-Proofpoint-ORIG-GUID: y-nR3mN-k_JZlf1vIJIq598mBROOtOsA 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. 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 Reviewed-by: Filipe Manana --- v4: rm -f, removed error/output redirection rm, -r removed for file image Check for the initialization of the local variable loop_dev[1-2] before calling _destroy_loop_device(). 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..35824df2baaa 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 + rm -rf $loop_mnt2 + + [ ! -z $loop_dev1 ] && _destroy_loop_device $loop_dev1 + [ ! -z $loop_dev1 ] && _destroy_loop_device $loop_dev2 + + rm -f $fs_img1 + rm -f $fs_img2 + _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 Thu Nov 2 11:28:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13443621 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 8CC5A14AA1 for ; Thu, 2 Nov 2023 11:31:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="xjr+RsHL"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="XNRxSbVi" Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F6B3131; Thu, 2 Nov 2023 04:31:18 -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 3A282hAp023642; Thu, 2 Nov 2023 11:31:11 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=zBkz+63hNoVtfNsH7p9MY4VqutBIuVr3zNb4l8C4EmI=; b=xjr+RsHLjRlh1o2yGjGJjZKw2Kz4McyBfumGT2nmHxVkRw3S7dGtgWf95bK7CfAzzXEF 4X1W/LJX+FoWOvFWj5L7nuNAOFqW7Z8riV33bdePhssOcIsfpK5Ok31hlB5r4Tz1EMEx kDZQ8W0/isyA9KRsmYUXAu9fLbywqWZ2yc9qxqINxCwu4tycrHIhpmiY/24xZP9/KJ1s S8TgAmzXvoy6VbrmkwzN7e5fvcW3luDaJU2nBJRyGic43KQlkgvJrQXjgId9G/o2HwDM HNys8nXf9jJFSA9ZDUeHJb+rAWPoaOUV75xnWwhFrAKauk9r1fbpIjhiPEkHE2yrmGoA YQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0rw29etc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:31:11 +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 3A2AVBXT009166; Thu, 2 Nov 2023 11:31:10 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u14x89ewy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:31:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EaJpCKR4iJCUA4NHnlpYuWVtZWwt+J//EtiBkRM67iM2ziT47MzZZOo9uX6jBdseJLnEYDbwKrvM5OE9hOxkWZwZKAy1NDuWySa6zlNa+pUWixTTddA8cZiMtY+iV/gKnPwB3DU4BTLIkgPAReicz0Q85mEqQRqJ0ChUUcVvvEbv3GclgdODF+OWz/RlvAChGXdZDAgTsQjiBrYHRsTAkTUZLJ68W8DHc07c/8GVHfCdYosjq/HWYw3ppOTH7biTmb+N1T0n4zWoho0B9hQo0DjaVeMpsVS8UUh3DLTRJU//nqSM+FKco9C9s1H4q/FLIzKeox83UrkUMY/WJuheCg== 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=zBkz+63hNoVtfNsH7p9MY4VqutBIuVr3zNb4l8C4EmI=; b=l6HFDoiKl4fADlPAAQoks/74sylVxNfVSFnf58J08EVEGpbX5bsGPM7PlYvRPooJWJ8T6VGFC31imA/HgcjzTBbSFQpQ8YihmTccQZBoKHYYgkqct8me7adTRdP0jUQCjdJPL93Tv7rh5+jE/W2f8FO0TSjUUVs4OW8HwXNfmeJiplIdUZmkm/8Dl+axKPpAgm8I134FW1a3xQpmyT6vHXLkv7OT4GiyvKQh5WojwRaWki6mw7UG4bAA6NEkFzC4AzBap/YTfzEgLbnTPlEWryESp4kdWpKHvaeXOdBlB7WasTCmqFjdOogmK8imrOu7PD1gYYybb2Kiz41Bm4Pm6A== 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=zBkz+63hNoVtfNsH7p9MY4VqutBIuVr3zNb4l8C4EmI=; b=XNRxSbVidYeQNUFg59Ten+nGEutt0nEo1lXwywmIAZLfz7a/mTRsBipjkEKODKhiCaOQi+GdhvyPLqKvGR3cILY57zf7UFmPX+C4T4q4XjpSttkYrK5ebbQk9rsUwPVCvN2k/BZhYXvSY0+CGHiRQnLBgU8DTz4m8xioO6Jv6Jk= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by PH0PR10MB4552.namprd10.prod.outlook.com (2603:10b6:510:42::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.21; Thu, 2 Nov 2023 11:31:08 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb%4]) with mapi id 15.20.6954.021; Thu, 2 Nov 2023 11:31:08 +0000 From: Anand Jain To: fstests@vger.kernel.org, fdmanana@kernel.org Cc: linux-btrfs@vger.kernel.org, zlang@redhat.com Subject: [PATCH v4 4/5] btrfs/219: cloned-device mount capability update Date: Thu, 2 Nov 2023 19:28:21 +0800 Message-ID: <5261fa17bc666f72fa3d7a5e77ed94872f2fed78.1698712764.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0039.apcprd02.prod.outlook.com (2603:1096:4:1f6::9) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) 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: PH0PR10MB5706:EE_|PH0PR10MB4552:EE_ X-MS-Office365-Filtering-Correlation-Id: 74b36004-2172-47aa-abe7-08dbdb97352c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M0Ku9cMY3KPDUUTjvd4NzmyJ5e1sWWOUjPGvwfhG91b1p6k0wuAgUt2OAa/r0ygS2zeXvlqtDLF5DERhv2gLkJG0IMe3knPcVXAO7hG25T+oBTg/NF5/rphAG6TXIs6CPUSmT4uw6l92N/WvM4eQqrvI31v8H/swljb85uSAMOMU0WhkLb8VCw63hDKKXWEP6IxhRUKX+6TaiNavW/nDdGMaCviv96Et61fbA07Ev7SaPoc643CsXua+eN9ALwXOo9O0EftUJvjF0bde745+QPMIZjb/NZYnMdf5dOT/LCyB03kqcaeV+n0AATLx4I2v06A8moBUxxhapnVLWOfIm6Yo3whX+/AZX/Qa9Sb5acNQJeB8BigTIbie9exqQO7/c4JiTKy3bneEmdq6KVUxhk+o+xIm4fUbjq7VS2p5vdV79SsKyWFXMr1g5mllN/UzDOh9qyyluLtYU0IB7YA1PB6TpQE7X+AAj1zHq29cri+88M6xStgRtL9v5oOFrnl1C/8eVxC0z4P1o/TdsPT/Lh1ezP8ojVzu50Gy5qtNEA8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(136003)(39860400002)(376002)(366004)(396003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(36756003)(86362001)(966005)(2616005)(478600001)(2906002)(316002)(41300700001)(44832011)(8676002)(4326008)(6666004)(6512007)(8936002)(6506007)(83380400001)(26005)(6486002)(5660300002)(66946007)(66476007)(66556008)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sqbDwGNxkvSMNzHyV8aOsGoV6rD/KSA7sesJpEQE2xd0GSCaFO1SxRPyDxIl5wdKijb+GCXS5yovd8OXB2gFWMk5ismKOX3anHKaIrBGBujxNq+X9uGniT5htL0GQEs8os73gh8mYYSfUnZzdIfOVgwIn3i8Df3R2TrS+IBsxT8BtumlsmpzR22v1LkiyBCyBKHngyzGTe1Rt396Q1+fPZjbrvkdMyawJJGg2QZHq54XZTfGHRXFBgeEGfM2AoK4cM5aT+THQZe3K4QIHY9dHW0WuRgb8yw/W3b+db1JMgTNvxeoSgWv6iW+O926H5PSsaHvMFe2p0564q+d+osrOlzPR+JyI31EXjv1ALJy/C6/OhxvxDgsS/Vw1tBS5iCNDygas61jYWfIyDY4P4cNGQrm8Lh9SsXNPJ/e9c7b/lZUbpym2Zjzasy/MbXM0OowJtjkqR9pJ1luYbgYDRnNF5f+0J1fA9rIHQZcMVyxSwJZUUghPtPDSTBKLNPGRLTqXP136gusFOJIbnxR/GSMtQbeY6xf5ddVimxSSBsO3TqRVodoJeUvGHxAQ9IIYnIyWnjQOm0tJxirP+r7GL7dKpiMb82J/dEdZ8/0ViMVs9XmmjdJ7wP5vWEpJezNETHTvz7E3CYiY86KlRjceOlXkHQT+0tGX+oZacRS9/HO+wqz0ZbnDa4Aq/TDThUA8vWQaHmlOYs/3Jsf7h3cyGef5X/PoP5CQkUOw3MnmuHSl9OrQnyHo3ulJprPoRtxpvqqqvnuDrGCTocUX9snew/VdsKGLgZyAcfd9OyWvblo5oJqEn3zTqZQM3LmbNytDlMSkTbhauoruiQZIGZEJdQR0/ZllbVMT1UPrMl3k3k87Id1i+rAifH8oAJywnuSr/MWw4EBvUNZFYJcPuCdrmKSiJn1RZSnK2YpjQvRVdHxGhv/3EUajSZkMw68YhSKR8T6ttW7OwbqQHdS7bd71wuRUQO11Vw1v5nj56z00ibGF13Fsrr2cUY43JpdQolN/KkNSHxGKzYCJIW0tTisJ37aripMK0we9CyddWDP2F3DHBDZKTFeUw009fTV6Ck3fBNTyZGlAEfyOAudKvgnV27QJE6IHrKnH5PdYXIAexx5TXM9YuSrJRc+cfci5sQNIQ6snddwujj21w1inHhzyBvj5Th+J4YHOQgIRYjazIddevWtuKkeotrJZtkWWAW3A5tYfq09L66huD50+HpRBVo/oobYIBPdvxibjAkJ7aO6FsDrvtub1NlHfu0YfizmbBLQrlxXPZMdgwe4KYhBgrn+R9jVI+Tv969u9wR0GA0M70OtRZsqaozuboUJLoxZq5E5xEKdxkA1m1/BwqM5l0WRNVnFQxQBEWLQomAi4VIICW9LcxF+61Eh8O4Bx76lsd/jsuE26Pa7+dmafY+QZ8nh9jOK8iSrfXot2aZEpyV+Bbs8AVLTsafPz3wGkmTUSLDiXUDeUNOt18xbemrrX7qvxaaNhDtl0HRmJ/sh207kcCWYeuugRalnjtycxAIj8JKL+sq0So68ltCPLVe6EmibLN3b/jxvO28LKI0DRjC+g1G44EGbwt7nB9JpmW2pybjI X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: uiNBygk1gLWLfGn7CpnoMogqviey0TQhSSOwvtZmWaRlkHYpN52NoaW9qF598G/pSF3nKd0RZPmUw81TNTwdvwrtrtlrdnryO78t7Cn8QgYpEdE+N5hS5KfFEnN8Zf+jS0MV6zilaWFYg6Za1XpDile4zA1eKtW7GhfYhPeYeYiHBrPYCTOGstcBru/wFUhT0pE1xg5NChXJaXMCdLpBBY7WD0ZF/ppwtD3dt8oLK8qWHX46DDyRJiBwz7fOygK8nZQXbzUopxfSMoMpnrV3TC7qNg4fJOW8Ny4z9u6zT1rwk2TELWlaBbVge46pjV3TQLd2Idvkg1kywoVj9GycyNr23EncARZfZe8hJ5BlgLd2/IgIgRjw3LlIhFXfpfU2ghe0R2prRw1K98Dy3RrVsjEDhKxNQxN4mTrVkXZ6hj9cj6Vb4vRV5oZOaDVaRUdbdN+X3SFse/IDS84fpI1Zbrv61PZ/nXEYn/ns5S2ON9VYT0cxJAzq+owtRvHWsgFv+Tx86pSPIeKVzbUnD3A0BU//bbTucPzzR/YAukdWo4yXsur3dxw6GwU8Xvh8o9T/rLH2rFW1sQNobqT5as8x7NIg4O0ygQ/8YNhYxdV1kiWkPtsKjpYr1oATWsPwJDEw8DGRq7LfLzzIS/wR+D1X4F4OFy1QzAQqj95g2hLowcp7lwFf3iwqBa330FQrdlZ6yIr6SI8F5Y7ZPpdN7CKjMHIPlHp7vUzcHLeGfKSARI7L+c4juFXJnE1eGVPWnznxut5FCFGTK0e8BujMyaAGD89UG5otN4aweX55oX2PoHbmYX/WvFFSlk06hEMiUQZY X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74b36004-2172-47aa-abe7-08dbdb97352c X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 11:31:08.6990 (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: hKXq5wpsylTfkejOoGQWX3PHAjSW1tqfxeuzbpPz9D1+m+2m3g83qq+T6M1cOa4qkkWxySYZvWYfWYvPgyo3qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4552 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-11-01_23,2023-11-02_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-2311020092 X-Proofpoint-GUID: iCHAkZpixSiQi-5Sff7PB9X09o88SmCh X-Proofpoint-ORIG-GUID: iCHAkZpixSiQi-5Sff7PB9X09o88SmCh 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 35824df2baaa..0bbfd6949cc8 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 Thu Nov 2 11:28:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13443622 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 9673314AA1 for ; Thu, 2 Nov 2023 11:31:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="sbXOhDvA"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="lKLprw/B" Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7297C136; Thu, 2 Nov 2023 04:31:23 -0700 (PDT) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A2839wZ015554; Thu, 2 Nov 2023 11:31:16 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=apolKmTWhcw4V3fQaCPp+GcEI3Qv8pmM8/GBCQllfwA=; b=sbXOhDvAHBfDeVCOs7JcqxXqTGzxtbHanLnWigweTMI1ykRPWqQe3Zv+r/cXhOMnmIv7 9fFZPf4aw4jVVONmV5+MOEDf3rkz8R/wLeYWZRCva62KcAP6e1ouNyu9G/9kcFhbRaa0 uwQFM5V1G9Mp1IyLCsZuRN/vifZ4oNxxCQwEL11ZHDcTLqZxwX7o1GZHbaF8fBe+CPvF dn+EYSzfXFMqsmmgVL5Vrd14+aEFz+MUOBJ9nk0KpifA9tLTKBLqESXpqR4Fs/2rQngo V+lz7+o2hnSYqjdWgJH4W0DjmDLZs1WobQUBmoFKTyX9Wpw7dhEUsTGvPa0WhBSQUVWB vA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u0s7c1g04-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:31:16 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3A2AZ7nv020096; Thu, 2 Nov 2023 11:31:15 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3u0rr8f67k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 Nov 2023 11:31:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ILEbLAzywi/xDNAmznBsNc4ARc8GKxB1PehF7wIDSPhZR6yY7fYCk59KEkcvBWO6bfgC71r2cSCTmt1swjRXQcUTSFuuQBvvpR1hLlj6E3YL54mpgDFYZD03OKIHIb/6PKvcY/oPxbw/7sYJpg10s2ovTmeKAOzYIYJojS/yBlvyD7xi8MuFXbgICcK1xSZYShmQaIS2CxPfU+iU7qQjH3EZRnTrkyGKmSyObG9AeEXJRMRfZesv5uYU+WYRFk8GjHcOaJoo4nDC5k+/oPRKDnBDDrZotJRTT8iqx7s/2Flv+PlNTZAg43B7qbSh7fNLNuT420t5mdK1c8PQ6apYjw== 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=apolKmTWhcw4V3fQaCPp+GcEI3Qv8pmM8/GBCQllfwA=; b=Dz6B5Nrdj9NosDERqcAC8AFLMLsP8m5s/31ohZYa3vND5aus3KdMXaj21B8TPHc2eqUnDR+GZFw/1DUZ/bLX282hjQ+P9LQtItU4ZdaIKhozyyDvpg1U+61NBUN5eFuJr/U5sU34fuFDfAs7zP9ik0Q4E5IzWqckgIIRPnFPFYnfUz4kB6RyAuUyAp3oepS+ihcVGe+PnSrfhsQfcWSRnhI5P/U1jXgkNt733Cznadd0DjfR8f1ijZ7X3Mbm7kX6wxkydVF0PdDiKesDDlPDL2kTVVgtznvd1onDMkfSVBPmglWclK2TJO/i9xysPh2f7ZGTJkFde+eql9KVZwI/BA== 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=apolKmTWhcw4V3fQaCPp+GcEI3Qv8pmM8/GBCQllfwA=; b=lKLprw/BNH0gBGbT5m2q6TALEXNCJz04umcc0DbLt1TZjgLnzcL+dpiI2gAfj1xQgOAlQYeQpK7KQEzH0z5IcuqLe7bX0VUJMi5C/ooUfyVNtA+4TbTWUddp9zgXPcJWLwmMlC5lXzsCGmhJYPcq5p0tP8LNwLUowYlnVkZEPzw= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by PH0PR10MB4552.namprd10.prod.outlook.com (2603:10b6:510:42::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.21; Thu, 2 Nov 2023 11:31:13 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::8732:b8be:e262:1fb%4]) with mapi id 15.20.6954.021; Thu, 2 Nov 2023 11:31:13 +0000 From: Anand Jain To: fstests@vger.kernel.org, fdmanana@kernel.org Cc: linux-btrfs@vger.kernel.org, zlang@redhat.com Subject: [PATCH v4 5/5] btrfs/219: add to the auto group Date: Thu, 2 Nov 2023 19:28:22 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0037.apcprd02.prod.outlook.com (2603:1096:4:1f6::13) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) 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: PH0PR10MB5706:EE_|PH0PR10MB4552:EE_ X-MS-Office365-Filtering-Correlation-Id: ac777b12-b002-47e9-4756-08dbdb973857 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ShY9MaG3W+Zn6BwpDtkM/99NQTXPFNatWPUxKIzFphqLT1jLNOCWcHBFZGECfv5RN62Ne3z4vMgzqGaGgxlfjqlX8+Nr6T7gRLXMXR+GjCjIlMh9o3wrMMimR8PQkrDxLZZgRr24Sh61gLTKDFG39C9U7OTurbHT53CxE+BRKBw5DYY/OVBbheBfGjjP+a31OsjNPFrm7oO8vJhRneOifbd2+t+JwzI5/X8KU81NaeKFRV1aPxbWfrBZPnpBnac3Ll3YSVulqZIflXKaRqk+EML+KFzgJTQES7Uee54/3sTM7rKjYvArSzzFeU38ksGieJapx6P9fP3Nq3NIoZCx/R1O8oFJFrTwezzeM3gv6nLmKfDB8ISr8u6BZaNmQip91OxezcxFtBuTGXpfgn2A+rhEbbCD9muInonl8U5G3RVa6fJ1SQTQbeLBah53QOwybtEY0P79wTJBa01Gj2U78XUNxlL4K/hYc0t9v8tf1e/eStV8Xp22fpqFLKvsGFQwZcAVfmTSwGGpHaH3G1jwuIzSbO3ljmFzDF8fwx/MbYznjF845w5oBPWuL3Dmcr8H X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(136003)(39860400002)(376002)(366004)(396003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(36756003)(86362001)(4744005)(2616005)(478600001)(2906002)(316002)(41300700001)(44832011)(8676002)(4326008)(6666004)(6512007)(8936002)(6506007)(83380400001)(26005)(6486002)(5660300002)(66946007)(66476007)(66556008)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E1fLrJOmdjfRs0Z1LVgjMqu811hl2xteIPnsSoBWdnNyjMvd9ujWSLrFBagx2/Pw0wMmZlSVRW7mTKlbpRO0FU7fhMRrjcBx+vz0MxpnJ9ezzyzEmWsVPRKgYo/a/VTy90W5bJwerY/47h7+n+zxvvdTQ1NaffmiSCzshtDE7mvQt9+Kv6yBzFAgEVNww6p5AqH6dxcZz8VQT3clUDPbQp/NiGm2x+V7xA8IApEJTVcApiFg3Feq//f+RQryPTv4mzba44eDUhpuyRNfKONIaHgtDEraGzcswp0euEJRqnWP/6AaHc15SlnRb6YtIXcXzPG0HkbFhQ3Z/Je/u2ljVI9yezU3zZAcw4cHZKkgKHatzt7Or5xrW4zttc8rFmSvSqk3XtJxcrnz/F0D4oo/RKfwaP9H++tClhNxQJtXu6TBXKkxyU6Zi+ViyCDuGVdB24mMUYifA9uXx+imCKwYuRF8Um2BH4e1c6zf+5LZsSccF6he2+pdaJQNnGeCBzWtxLAe7TL355d5BdohNi5+N8KNni32mb/+UjNYzg56PwxvzRwN7bWkcaVOrrRr6tgvTnUVAAtGwemO4+E5E899FJO0idgw/b8q8NKQ9Frh+iNGAldzc/1GmVRR8PAyVtF9tw6vLGaIZEi/Ug9p/A98Y7PJ+md7kuLb/1zHCINJBZpcb7KeM1Mu1lOJBgItClY9oQKH/vMm0hTveaKSyvzl5wint2wivCRkqLXqVTuXAD3YOngJ3e82QI9D/yu9Uke3TcSjPYr+Yn6/x2viTyt98KQDB29SReyf7jrw6HN717rwXn60vt88P2hh5wj2i3k906pGj1xPjkHKt2A5ApoP5Mbz9lGUj8GGPRnDG8TVFUilk0XDTK5YtZMFfUV5G8n4p4Iy+6SRvocSr7H6o4/tPEw3XEUhosZLzgraImo8YEs1aeRaGlOybCGktPlmY4WNGbmRTr5OJnHCYwBQ4fgAsjyJ1h68/KxfRc0G91wHn95OmAaxFsU9UqMajPA8+46X1sb0UWq+mo05FrOuqWcxlYnBCIFutRecly92FvGuBbZWkuFAwvqDWKbPFONnovl3QN8pQOhqWONNr29Tmt6EspwIrNXuOp6ao6Bu/CScbJ7f+njzVWGfpzAz/8847QvocTsX+my01fI33ENhFopyysCMTopo1/ZjNClqlfgM6OFXpirEhyUx3VHciVcKWj3kJjPnIK3vz8zGD7/xMif1lalz6TdtfQU3OS/dbS0jrh19+gNBcvwryJOOYQeYqi2S6Z0ptv5OkrbR7dEvUAdrmdWScxTyOTADYBIxtuj6EVNh0kcWUnpfi5JJkKjAwICxApaUGjJcXqajK2G9mbt28+GaYt6OjpeggQS42j5BIh1dm0iWbrCKfn0in2l0imsJzdeBnKI3Kcgm6ZvTUdKofLmeFSY2GzCZ1sawogz8NkLYpl01ZEZ2MkqKz3EmRVDvAqgNoG/zmkDZchdaBpT64CVHAFeaRGXnfwr2NiSpJ4PrdvMzMp7Zc8XlrCAHfvbpB0OY/ECLVysV+ULtwvaY27+w/vMcdUkBgzfHtr474gB9GApBJ1Ek3qWkQ9RjAmqc X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: YCsu0VlfM3tPG3VJoLVaaeCV96Pa5X3xNR18cl9kysAMG8jGB2CBfNnQRBcDKpESXd7aBe/r75KidIE8JwzxgR9saZhOk8QfQafZ0vRpgemml0lZn5lBe1Eo+W1i75lQR8lc47qT3rBDTiz02pUAekOO9XHxLBQ8Rree25MVhLUPq4yqHduePKxB0sl4VT6hqddc/3I9Ct+w7kC9TKrHoFYPAdgkatfnKPgH2upjBl6s9eY869ICBMJ8lcqspig0jpqjtkdAf+stldLf2rZjH12ZHN27tQpmNyWfwr06pzkCxeotPmYTGix1nQieo1G0olGqmMemqx8qauZF0AJQmAu28ie8S6fzwWiXjj/UwTky5ZMwo9OYdOXeL/io+nO9CaCXFFs8nek3f3nLCtxD42PZDcYqgcy6SFjm4VvYVDFIc2cebgkIFF+V6BmYqN52UkneI4r4e6yQDQUTljOjB4wuWTgAJM+fb+NuuB2YvNXXE3BlTnnZE6f/QBLaZCNke+/fgDA12ElnQTgZ+cqsg7koXXCAp7V5G0+KGNYp+RgBSkrhEhpnxexU5xA0+0pP0m0sag+edE2TvCS6iBVDmar979xifB4httm2a20Ot/06kEnm0Mxk7EicuzLb2izYwqpHbIQD91yHarcAhtyWx8eLcGCEkmeaBdke17CYTaHOnapBVOQWHK3Nkhd61CRS9Q4XgtnMtXQnzew/BjLVZMBMVKk7Ivuk2WRGC1tbnl2knE8gcYUGPDg93QYo1V1diN8FY5vaxGD2ht2oKNfGRzxN+nTQE4neC1CiZEB3mdGRNoGaERD89KoDWKvFvbE5 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac777b12-b002-47e9-4756-08dbdb973857 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 11:31:13.5894 (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: nUM9oo5LwIBpoVy/b9BjPY9NDoEDIoaBrZjCV1Iljp/+EC3L0q7kcVSXOcLqxNXZjQs26hg97RARZCk07i4llQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4552 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-11-01_23,2023-11-02_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxscore=0 spamscore=0 phishscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2311020092 X-Proofpoint-GUID: Jc8Er3jrnp3Y5EByGyHvBefRnA_jiq8J X-Proofpoint-ORIG-GUID: Jc8Er3jrnp3Y5EByGyHvBefRnA_jiq8J 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 0bbfd6949cc8..9da835dcab10 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()