From patchwork Thu Mar 14 10:37:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13592317 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 EF6BC5DF26; Thu, 14 Mar 2024 10:38:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412698; cv=fail; b=UlwTrTvjcMB2lEPAa2WDX0gvXARp9Rh/PbcdvcLWnXxFfwfR5DEAmDkxRxb6kjeaKZAN5/tpUas4OTuK31ENZb38DF26P+irn6PMQCb5CoX/2xgGzQH5RXrztM3kstFY9FQmV2tmQ/Y9/XilP8H3KJ7MGxCtzqMINviEOuiAm30= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412698; c=relaxed/simple; bh=ZTsqk4BCNDvNMBLmLmpBNmyGASCY1sPzVkN8ikF/HhA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Pp4BifxtxLVDBkOjgySlr47PniVBjNLJ8iiZ8uOfQwKmoQZT9/7cvD/yfvcQZdbVG8j67y/J+FiEIph0eg1EWrg/KXxjMvdQgBi15gF92HMrz6o6F+3wVpZ41t9KOCg6MbQMXHBcY34ZYHNuhUpiddmqoPUpsacIZqh8fOHkpX8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=lJ4Gv29t; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=MTtlsjzg; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="lJ4Gv29t"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="MTtlsjzg" 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 42E7mqmh012798; Thu, 14 Mar 2024 10:38:14 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-11-20; bh=wMC6CN4j2Vul/kLwwpHXjAarc9xyEa3TEICxoFa7PZg=; b=lJ4Gv29tYjQbFI4hJkPB/wGt+0yCJ9VUOA5f7TCmF1la4rl+mbOG7CH/N5eSjfEoi2eP c3RMwdiQMkPt42l/gTDtSQ/IT+vZVmyPKxYWMwWsU2+zhFMbIIItCONLVZtiJWt5ZTyr xiCqo96QnuHvcIUuu/bZMm6zJnIxlkCkPmPv4yc2+3fDarj3nKMpibfVwiDzxgV7jSC+ qD21ainfHeLm31oScO7eAshQF4FSBwSASaKC1fgZfMV612X7MYo/VaNkmj/SPjMvTLiu lDrQYNB1ginSG2r8ouxKwe72FytatR4YLRPoTRUOrGN8dntWEhLXh3BW8r8negMYk4iH xg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wre6ek3st-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:14 +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 42EAAfv8004920; Thu, 14 Mar 2024 10:38:13 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3wre7ah9xf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BUYUKAgujCJ0mMngTJW5dVh3i9RINMse20r5GUMECwg4MYnH24jUQOtuKRTJfw1m57gD7cfymXb/ba0a76lNKVjXaAk2uObI1ReOQMov6A2hyf3FLgyZRFa2JmOs4c/vAuGGzOEAmdyP1KuBX5K2jT/c23ATc45mAOHbWutpcnjr3Omhgz4dbByZ1KFsj8Hz38D3NJDmbd6O/WqdajvRbBC2rEqDlNVAhC4MVn08RuV22+cgbLsx8AyBoeOVAuJ6Jl5iydhVhXkCMWXXj3aiG4WVQKWzJU84LasUhRPz7EHjjGMlv2taIwiEuAxy5j7oFaaTwrOeEOYn3oJB7c9jGQ== 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=wMC6CN4j2Vul/kLwwpHXjAarc9xyEa3TEICxoFa7PZg=; b=gjsOBeh9GkaiyTEOrg39UOxyX/9svRpIJGk30ZO1xj4iJTZoQaN8j8gOyT1oHETjZIYOcs4r+u2LmvroX5Q4SzcuPqt0vcj9HSqe08A40p5ImOE+AKO+pBiaY/ZOcYol5yWTW9LoJONtU2+fwX+Z9deH8arBuPcb4aA84Mlys9GWkLvRSFlxST4XdfCHknTEV0jXCeb05TCiZj6cUfP+P5FqAF5U57saJMrIQckcXMapTNwLtUhu2pKupGJomNnZme9sARnMZafpGbAVs4XpK0XlV1UbqjShKWOciN81LsWThOb+XzJ8bS4zZZzTsnqRe0wJB115QyLS3YN30r7N5Q== 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=wMC6CN4j2Vul/kLwwpHXjAarc9xyEa3TEICxoFa7PZg=; b=MTtlsjzgKVfwZYD3K+lC+tKuMrMXrSOG6YDW8ltcbznzs0HhYDO3xe/3EqrGe5sHc9j+YWHYD90SM38fQHMJ4T2KFuxNgbowgt53PfGLQeuQqNpfzav3MDBiL8Se1B5Rqs23kov+Va0HxVoIxDi/l2NUZIvCtf237rchxK+rx+o= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SN7PR10MB6617.namprd10.prod.outlook.com (2603:10b6:806:2ac::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.20; Thu, 14 Mar 2024 10:38:11 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b%7]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 10:38:11 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, boris@bur.io Subject: [PATCH v2 1/4] common/btrfs: introduce _require_btrfs_send_version Date: Thu, 14 Mar 2024 16:07:37 +0530 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: PN3PR01CA0105.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:9b::9) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|SN7PR10MB6617:EE_ X-MS-Office365-Filtering-Correlation-Id: 15adbc30-cc13-481e-3996-08dc4412d84a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o57M3Nh8pPxqat3caY7t9QxiW7ZJY8E23gQEz/hyn3Wg2/kvf41pJ2k2+FXwdDgRusXNDg4LqNEojgjW1xgB6yPHzhYnVYkACmPdhjcOAvQZCBJ96UvSfI+6fTWq2oS3Lmacy+3vqIJ4GN8K6gVmHK39NvFEkK4OqRRsOZBZ9hGjxvbZkv31IRRIkyj9wmnakSFL31b6XCYgcJC3cmCCE1Fx3htPSFABLrrclqFSU8iFdlqbrw8nHu8krLueCz6pB3bxf+OhC7EoSMWqrJ3v5RJV4cogXTE95I0o/S9492/tZXZdNqroBC3iewXhaTwZT1RdPznlwdDFNxXz9txySSE/tpJLJSloPHlA0d7kuMx99lQx1yn8fQ62iNiEmjILCAEmeSgKN2rMYg5QAcX7ynYaXhDkZcr/Vrr4tEsJaY3flFZEi7Ufc5iIIqrjL5otF+jJFOzAT5UPERj61WKVLXyYrkhrewx7TzfBhZZgs0mF53AVPZiMWVAATxJtpN+MXVoJRe16yIrMiL6mZsL3CQs1hVnG5o0/h5Bdzf9s9l9VPR9BxCGMGWYaWoFvfVepcW9W/z9jfrv2dlMJ4DevUN9fuykhWVsxU2ODa9AGT4SB9pb8nX/05qGusyKbgPdyDKEnoE+y+z5dxHHpymRCWFGQwt3ZYlZMt3ztIlEvBNo= 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)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zhDmhAjD8Bg0D0/2HkLkFIxYAJRcHwTVsNWAA+ExYQ0e5bjuIrD7jbrETKZBSZrFvYpbgAko6iS5UPpLxB4FawWHcuYp9x85yf0VMr9wQUSyiJuN5o1ZJHSLZga01dHvfj5HygpCOIOp5RM5oll7WCO7uvvLG7si7Yn6peuqEurDHb+AQPFaAsLXLaTisx7d7vqh0VuPWxGC/xJL8t4CYXtA7nb8xaByd/fCe6oGPnXYejG5skemeTzLEpBqlqCWXwG648IZOPuwXmer6C+5sttmHJ3Du3GdjOYvZXWT1Hk+9N3v6qqjT0pATi08wpPo7XhDW8XeDTlqg9d72msR1NufXQ2I7wE7fNeRyGtufUckDDCSJ8Cx/0uUKBoMHwi2/8Xw78ueSX3nqqJZx2rDnJ8j8hE+Nd9QI4U7wuFyiqqNoVRtX15RPbQBS3mFr+rEc21xp3+yqi9YY/5J64rILphpNf745IxRG4HMqVCOY0eLj8zdq3EdYqFYZdu8Omq3QGfZbq3BRmAVh/tWQbdOF1LdWyEfOu8mt9jpBShlI2DgzMAsFIjdVxZ/QnFbibXUoxaUebLXZIqmklF4bva2E2FBNar58K7hxqZhin/hGLj77jdxLEwQNMrmuggC6B9YI7BnPlaDbDEtTxzhbaCKAuDut378886689xRWkKayywWeQ0YYneFFh47tq92lw+eswPJMIBAUYtmrig587susTv7dD3e7TnQD0kDKOMAN7odJWzdO6ZUUXls6VlGa49wMLSVy68ICT0LFtRVjqo+kYSYscwCxYMknET0McyFtAkdtLBmMM7noqxkH8J+0UMzjYwWzsd4+hkyJtHBLBNsec/CzpG+FzU2fBy+0MYOMdaQ8jXiLmGR8716JHGnylVO+fscyBmOuowS1IKR5TnUC7LJtQYgVUXd1z84o35Ju+qXTWQYURa6gbpSGXGA1qOL/F3fKwZKxJq2DRS1z1VxtRN7ys2I2vN61faasQhNy6RnzDX8uwRFl+dTvw7Wl/cHdWhUpc15KO45OnfaUdPHdqE4PpD2F/ls0LBzJ+TyPslhiDEBqRd/jC98Q9zXW+hI0XdA2oz7h28jZdlqMuH3tsD0+la7OitLjOb4IVYAMnkXliUnlB7lgf8XttTZ1VrFUEmOCbtvtSk4cpDZxKuTY/UZoGjr+a+wQncLc7VzwzKum14vDdwTm/eEmXzCpR2fcpz4ar8uP0nNXqfjYo1ot6/kbXKrK2vjQ9gb3Ov7u4aLgeCQc7MnRspGnr+m/qtSvUahhTiVHZA5yyWqbENzpOAKTYDLP4eecr5yq5hawNgoJ7bfKDkmF/liX41g56AklfUeFafaxut3YPiQ+iDz3DmV0tFGb9LAKOrycmA+nY4xcH2w1rVHeXoi5LfUEXJvzFulf4GtyVnHPHWVAVy4aGfHHmCGW4tiRszpvha2k7yJ/hzzMFgPmIMKs1R7w0rOXc7y3BpEzQ6WtGVOxnUlfzxa4tN7q1pd99/ZQ1L6HaVVWPGV05Rnhl2riYFTUsRSxKhdvK8SIz9KJbCfT/l+Bkkm/yRCoJ6yiSc99a/S+u66PU5HXSPPGP5iGlflEKE4 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: oyb2wpe9z3N5HGeaeBiq7pWS8V9i+aUTIHrkRWMUShcXfq/v9JMjDqXZI9a1sMogALQav6JiAIYBCbkWChbWxj8y7M3JXYiVk3YmIvxcup8F54JjsPR/pJqCaFicqbrQswOhobi5IHd8953BiVEgumXT+F4VxOsircDxKKDtxW3tYF4nZWxMQ2WzXe8x0W9M3140xG1xYAfnXKWWQGtKiPA3yxxAFaqR5MT0ot3N0g5LYfL59MQ1tX2EiAvG3M/1biZbpA+G99nwLYcHGya8rmTeBA5nOZNevzBWddsTqZ3p1YOBNLYN1P8k96NL6XllyDjEUPHwqIEHYtcBGrdf76zvuLWyjj1OiXh6zdJABlG6KmedMPLbLhSZWfIAxE3SGMDfa4FR//X6A1hiWSd5AXu6hCSsH8CZDcEN/h8WTnEe8ri4hEY9v2AsVrREcZPdqWj0zmJmBujF12PzEASeZk0VEwkMzgBZmrCY48idfYcBBJvQ8gwdbuZW2PiooTCGCEoILdZszYBxJpHfT98Uvhw8hRRhyqTe70HC2eEJqVmJaW3VJtlOMNPFy37JjWKbbTNrf9e6AmZ/32cL//HcTUscWFWu/qNU1olFSmSSW0w= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15adbc30-cc13-481e-3996-08dc4412d84a X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 10:38:11.1707 (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: XXYCcakZlbjuFDSg67/b68YSVJX0Kqrt7pXtQcW9QHzOituvl2Z67lTIhokHC5hpixRIG0DFP4QOuYrQnKhrAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6617 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-14_08,2024-03-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2403140075 X-Proofpoint-GUID: MfezuLvHXZAxxmt3Od1ZByJWwVJdcOfV X-Proofpoint-ORIG-GUID: MfezuLvHXZAxxmt3Od1ZByJWwVJdcOfV Rename _require_btrfs_send_v2() to _require_btrfs_send_version() and check if the Btrfs kernel supports the v3 stream. Signed-off-by: Anand Jain Reviewed-by: Boris Burkov --- common/btrfs | 10 ++++++---- tests/btrfs/281 | 2 +- tests/btrfs/284 | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/common/btrfs b/common/btrfs index aa344706cd5f..ae13fb55cbc6 100644 --- a/common/btrfs +++ b/common/btrfs @@ -662,18 +662,20 @@ _require_btrfs_corrupt_block() _require_command "$BTRFS_CORRUPT_BLOCK_PROG" btrfs-corrupt-block } -_require_btrfs_send_v2() +_require_btrfs_send_version() { + local version=$1 + # Check first if btrfs-progs supports the v2 stream. _require_btrfs_command send --compressed-data # Now check the kernel support. If send_stream_version does not exists, # then it's a kernel that only supports v1. [ -f /sys/fs/btrfs/features/send_stream_version ] || \ - _notrun "kernel does not support send stream v2" + _notrun "kernel does not support send stream $version" - [ $(cat /sys/fs/btrfs/features/send_stream_version) -gt 1 ] || \ - _notrun "kernel does not support send stream v2" + [ $(cat /sys/fs/btrfs/features/send_stream_version) -ge $version ] || \ + _notrun "kernel does not support send stream $version" } # Get the bytenr associated to a file extent item at a given file offset. diff --git a/tests/btrfs/281 b/tests/btrfs/281 index 6407522567b8..ddc7d9e8b06d 100755 --- a/tests/btrfs/281 +++ b/tests/btrfs/281 @@ -22,7 +22,7 @@ _begin_fstest auto quick send compress clone fiemap _supported_fs btrfs _require_test _require_scratch_reflink -_require_btrfs_send_v2 +_require_btrfs_send_version 2 _require_xfs_io_command "fiemap" _require_fssum _require_btrfs_no_nodatacow diff --git a/tests/btrfs/284 b/tests/btrfs/284 index c6692668f7fc..0df494bc8ab4 100755 --- a/tests/btrfs/284 +++ b/tests/btrfs/284 @@ -12,7 +12,7 @@ _begin_fstest auto quick send compress snapshot # Modify as appropriate. _supported_fs btrfs -_require_btrfs_send_v2 +_require_btrfs_send_version 2 _require_test # The size needed is variable as it depends on the specific randomized # operations from fsstress and on the value of $LOAD_FACTOR. But require at From patchwork Thu Mar 14 10:37:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13592318 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 C76021A38FC; Thu, 14 Mar 2024 10:38:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412705; cv=fail; b=eG6xfOWP4LPmoFkAzx6LW9o0F4cFQN2ct07P6CJ8OpkeFXqK5Kym3fwCfBPQXiiOEpAF6nTfS7RE3m3upjsQTL2g4YSuJyN29Ty5lD6qy/OIizMRByvizbN6ArPQCRK5EDtTm/1HB0IS2KGv/MB3W1ESBGuCN5sa6zzu/w7oBfk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412705; c=relaxed/simple; bh=4vNhCfDFv+S67Zshu9WBQjRuGmQF7QLtr0CmFiuuqtk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=sBvrO54y9lP3bl6ccvn7USoCntaLfS1drvNC2XPL7jPZJzto1yD5VLy9HJVN5MsrHOb4YcAShSHaLZejpD4QKbfX/W19ISnVMIwYUpcr8jxZPt1292lfeRnefJZHpgyGeUFE+PMnD/UoXPBul2g4lN/i3byNDeecLRY8+R2DwkA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=dc965EQv; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=IAq77f6J; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="dc965EQv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="IAq77f6J" 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 42E7nLa7014529; Thu, 14 Mar 2024 10:38:21 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-11-20; bh=zkulvl4/QE6BVOyWlD31CD5mEzYDfMKs89ve0q8OW6o=; b=dc965EQvzTPKUUKsP4XqeCAF0kvk6HXMfDbm+y4rooIM8Dx7p8JZDwZ/JrH4++h7RL65 LFZi9oNjVGu8Kmq7ip1WSod34/O+rlVZbzSPrO+lAxXEfydd36Tz2VD9TBsenAaQEdbA 2ne5SldZvsSZvvlIvQufvFoN4rASug4RPcR86vZiGPXSZysOQhBPxRKL3iDHQZAsjV+z x/ScYr5mZyTXf9Ke33Ren2H/KfiVnZDumRIQSN3hCo0+SNq3XYcqDFYFjq4GfFrVQ5Wj os8JtLQ3+ZATpFSzGMhXD25b1hsOnzSqiupp9tCKp+6dTRSHPciTavi3mU7TP4uANUnb Kg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wrfnbtxg3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:21 +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 42E9BvBM004760; Thu, 14 Mar 2024 10:38:20 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3wre7aha0t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hSal2jKTPb1YquGozFw6jSQGnykn4c8WdeDhdjCfdAYdIY049avEE6T9Zzi+nXzMf5RS4g9ix+lrqUf7t4PSkiTs+Zdvgi7bsfHXMczZa4iJHPsQsKshZjitvQYpIK8SjeATeUuXFk7qz+872vjTkjFrJIIT1xyEfxaojcT+frKkQ1WK8hHUzNnddEUM5TUDmeAxYPkxkG3FdQLpVCa01pFa2+x0KUDs/3yHs6tj/cGEND1EXTS7DJDwISh+N/CHfOJPG19dB9SINgpdh1eOUL8kHnzlnBH0rhoq0YVabfqtzCa1H4Yz134sHmegMnLhP90zm+jwRyPZ/dK4EppDUQ== 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=zkulvl4/QE6BVOyWlD31CD5mEzYDfMKs89ve0q8OW6o=; b=jgtQYsRanJDKcEmc7+p+mx40QLDx+vLdRLqBZzMVwHwzDeU8QYW03XE+XvB8u3aiDPMm1LhSX3K4lUNFMi17QJ4TjeN6DzDdQUmoVbC6Pf3yfgZHLlCinyZAQcoa01idZZG8Tq7HOwwuBfh9iajqYRxHFC0nlOyt2eeqS7Wkeh+FN58+BPsLKnb5L9J4ID1D1A0As+AXXgzSFa0unh1CzbN0mMN8VqfdBZKuHff2XpWnvdZOslWq0bCYYr6svMRu12XgeJdenTg2oTKLEXygrQNZjIXqjy1rnGHFN0LAZiv1d/WyYru5fsYY5SQpRL9FRyY7koOAHXtFDd00+goAqg== 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=zkulvl4/QE6BVOyWlD31CD5mEzYDfMKs89ve0q8OW6o=; b=IAq77f6JcsmS8+htpJiFAafHm39mGbnz99jbuj2zz32gg39CSTWL3hRQN3OvGEq2Vlk6hs8EdUiOJSox32C+dN9iXVvOlLq08t+ZOvtp288ujlOahAUapiFZ92qjYhR24h/Gy33CmGJxzmEZHfu8nboEcs+d6bVuMZBY/IQ4wck= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SN7PR10MB6617.namprd10.prod.outlook.com (2603:10b6:806:2ac::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.20; Thu, 14 Mar 2024 10:38:18 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b%7]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 10:38:18 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, boris@bur.io Subject: [PATCH v2 2/4] btrfs/320: skip -O squota runs Date: Thu, 14 Mar 2024 16:07:38 +0530 Message-ID: <9fac4d3f4fc7a2fc0ee31344440d3350a7d7ac12.1710411934.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: PN2PR01CA0193.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:e8::16) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|SN7PR10MB6617:EE_ X-MS-Office365-Filtering-Correlation-Id: dd80c1ed-6ca0-417b-08f8-08dc4412dcb2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dp/A3P5BF9d74NjQp5AyCCXlvr+/8kPEsPvD6oDE3kBm4vp1C9/U53sMiTxtBBTBUENeVzJQgIftNnU2bt5q5Na7ITs+FMEumSssjcL7KIxOXrxC31QSMTGLMbq2WekBAy2sePQgSARM4q97ENT1mqQGouR0RJ8s4JjVDhgCjQisRbv82I5H4SO0IKbcUTx0oABHPzO1Q7PJDxq1QiEzQt1raReepjXZWmDE+sn04cpA2fskwKPbiGVj74+HOf4Cf54oNE0F+T1IQj25SlST1Squ28AHYISvHumAkbn948SfmcuMTksuqHbMBrfMRvGbXwVf0DB9m00m1WNO7soY/rjupcIbVXgd32DzQAeJrwKDfMqTbH3xUnknWPvkfC3Yea6Bjqq3007Odn0BW3BuoQxPevuWU+XwD7UWZyyrRcrRGo9mGQ7BfpDnRAvZNxACXZ1X55FMggIOkoyCzZzAFJxzpQPsWW3O7wtDz956XrNYnO2OP4Z6vyGP2x2SALgdGa9CU4Ddvk8FJc5qju1Es5ZCmt8/YSD3N8Niok4l2VJDXcTNZe39nXuoWAPy5hGoOZQfLALC4fbV2yX4rF0CWMZDgM+GbyFChMMTP/MfpnRqbSq2e/Up/tC3ZBkiupoM6cJHPnrdAHAMIAuu5Xve5zGy/gcCmy7z6/3Wciez7qE= 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)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ClObD5q37Nviopa/iarggtf1yRpO62HMsX+daeQRzoaLm37SoCB1qR74O91W0XPKOBtzZelnBpBJhaUfdo/wB/+bVIV7E6AXy0+5VrEGIkjvALle7ACn/aAk04jNePJ6DTQDawlRC4mqZSuHxfJzqwa2r7TvI6/v/pq2ZrVZgvw+ySUAOv8N6XBhaKD+qLs7fd+De/yJnwK7MwQs73++bfHnVWEqPVLuaUd18X7J9ILLGaskJKkMBxPe8UFcxhg2/PBHbcQQpxMae2bmEa4ji1ouh25Uq8/begwOgayT4KdKTvrswdJxEqx1E7vQVLlQvKSlZUfeFiNigdtGPRVnvNZa6K6TOkmdKFG6rUC2OJugT6HiR2jybtseO8NeCDKA6+OFQyky9sQWjN7Rjo2tDLcvt981dseCCJakinQKma1spQZAwM5IiQbCxR0VxYzFw/D3owmRYGHRaVPipKF3HeiXv/+3ggPdpBLHB5A+Rj+rl/sThEHw2VZGinUpbhyWhw22abOKBVQes1tHnkx0eHiBkkjKBs7H2SuseoV3B+UH3IlXsH+s6KcBg1KcrM3ezv39TVhtaYz43ivFS/C+shdYgneDujMhYUhXDkXhAFt5iX1TIEayYZxtUP+/Pz4iXX8fp8Er+BkvwnYyIFwUYb/tLC93AWyOe3DkPlEXgAMzRvb/JF90TJytWMq42ca/bd9TjpktjeDTuHDdjoogO9cUSTNa7IMh3bRET/dqtHy8pEJyJb9aZMffNdn9HGqYf0U+rXUNI5ZqaeGpnZdUxxFhppmsr/topLn9DZXkkUMU+I0SP/Gud4wHJh4Jxo32dLR9gyLndK7WO2bKYn0ofqWa/3jkCPQxYcWzCj8w37VQgI9yHzkogsb2GUq80YO6PdjoOl0JjMv87lPJmmCHMwOZ0aOxwzgIzqKGEY7SrZVMJCrTfIXploRmQv/SLgXgDf33skhfZtxoPyUNxKu6JfB42t5vLaDI1j+IVUrdW2Its1PqyS1s3+ghWGnlhHSV9Ai3ZkkYg/FvD2f3CnI3jzMOcxnOVV1yI4VXuzmJ29G2tdjr0sR5flglfQQ6o3s4TApi9zPi+GPeJ0sNUKRiL27WCgW64iBYR85yJyEe2vTDAsUtMLgAvpnWj8/8Fwm4+PiRHThNys9HR/kJNYui6E1GQ2UGvr5c/FoqetUQgduPgrDnXNXBvlOZoxCWCKIBBV9OBFTzmgQhpxQ4gEPXKTn9dK84xXUIff1TMn+7SoiazSBwmjlt4q9ILDArtHuP+bdmgKAr8jh0ghhPSQ1slXHn/mKBjiby0dNRXv4Tn1uwmuzjz5cUutOJUQj+WnMcyOtxbuwddbFSrwDBrPL3nciW+SSInHMJooqljm83aI+K/8PMJkYgokzN5bR2yCDI4WJwoQftp6R8sFptCVAcP/r5G5TWPdakIdZz7Se3RyTMJRImQXu9H/LBFWB6sjs0baB0ividhn4crvNtaVU3fKVfvryvPUzVR5pBBLLvGJ2aQJIK7kOSHRy34occdbBiHtPgOGVJDI3ZSMVm7iBZeo/pOh8wNjgIpT/asJl2FOW04IhwrLsOolyod0W0Fu99 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GjTVS7jMRAi5z1ye6u0ntVU4DxJ8d5DWqTNx3km/gRhEPRfwxGikfmtUPbQ2j+3m63/JEzz6SBOuV2zur9JSPWlmahZxriFCitAXdyAUsC0eoo48XQ/5Lt7vXMtVNSE2zRSMA9vWo/J+3Ipk6psa7TdAKzRJKWbciXBj4fXHpOkS6SFfD8ixoo3ZwWehz9wGIm22zQST1y70fMlIfprwYrJR33PHgUKksgRaXbL3AV/3O2q8hlQ8TuoEpyGutBJoWQa5aszKaQo7Egzaofvd04f/WoNmDMukYlv//4bCwzqEhn+yorOIjyoMYfSeYFtmxxI9sTUtq+xfgkv+EPoarnk20Znh+dlNf2CFy438mRnHr/uzplEMjzDzlyDp8HBbX4cdeI/OtCHsIu5+Q2iKyvTSLYjVphAaER8cos9xSePKsZ30i0ZvaqkjoCfkGS0QiUTMBJNg2KwkiLmL2Gdq27elDbHQ3dG4nU+2kt3eHDUFYGWasPbBL44iw8ZMnZdjU23h9qBP/x+eMGX2Xf4ZnXlgAqduyt0tE2ehDh12mh+R0uQ8b9S0eKTGIng41t6tPaCYr0T6FNmT1Doq/E/7cNKZITxuFKMEb6AGFztIumE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd80c1ed-6ca0-417b-08f8-08dc4412dcb2 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 10:38:18.5639 (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: p/SqBMW4ACpQ09j+yQZY0IOyeeDSmtkgHJSbbkYNhb0k654ZTtJ6x7QyaIm6elOLQ/a+JkobCj9jo4a/7RTC4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6617 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-14_08,2024-03-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2403140075 X-Proofpoint-GUID: RL1cpxermSfkEW5dn4iFp7xUsI_HU-bW X-Proofpoint-ORIG-GUID: RL1cpxermSfkEW5dn4iFp7xUsI_HU-bW From: Boris Burkov This test makes assumptions about the shared usage under snapshots which are not valid when using squotas. Skip squotas for this test. Also, make it use the rescan wrapper, just for uniformity and since it doesn't hurt. Signed-off-by: Boris Burkov Signed-off-by: Anand Jain [ added _require_qgroup_rescan ] --- tests/btrfs/320 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/btrfs/320 b/tests/btrfs/320 index 408053457aba..df7acdbb3deb 100755 --- a/tests/btrfs/320 +++ b/tests/btrfs/320 @@ -15,7 +15,9 @@ _begin_fstest auto qgroup limit _supported_fs btrfs _require_scratch +_require_qgroup_rescan _require_btrfs_qgroup_report +_require_scratch_qgroup # Test to make sure we can actually turn it on and it makes sense _basic_test() @@ -23,7 +25,7 @@ _basic_test() echo "=== basic test ===" >> $seqres.full _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a _run_btrfs_util_prog quota enable $SCRATCH_MNT/a - _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT + _qgroup_rescan $SCRATCH_MNT subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) $BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid >> \ $seqres.full 2>&1 @@ -62,7 +64,7 @@ _rescan_test() echo "qgroup values before rescan: $output" >> $seqres.full refer=$(echo $output | $AWK_PROG '{ print $2 }') excl=$(echo $output | $AWK_PROG '{ print $3 }') - _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT + _qgroup_rescan $SCRATCH_MNT output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid") echo "qgroup values after rescan: $output" >> $seqres.full [ $refer -eq $(echo $output | $AWK_PROG '{ print $2 }') ] || \ From patchwork Thu Mar 14 10:37:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13592319 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 5E68C1A38FC; Thu, 14 Mar 2024 10:38:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412715; cv=fail; b=D0MtG+2xCWhAW2wh8StlmGmwMPACRSr11Awu8WlocCiFIBukfZHn86enm6TT7J2bhT8e+9g1x0UVqXn2L6/mV7Fdn21TVHoLq4iW5x4QUbYZDcCcBhBUKYiooHwcVc2RiUJerH4Jtn1c67fx19RvhWea4KXUQ3YPg+jJEjirRS8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412715; c=relaxed/simple; bh=xHQksDvOrVJxSggjk3UGN/CZTl/OCGQCyQ4NxZgj+vk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=LD/XEH6yFHglfOtsDBTnTLM9mm6JP6FoFxIVTS4oElEj23iVgWo+AcH/843WUkcE3LZ87xCRp1dOx6O4gChNnKu7vOMv6hyPSWC0hYd418jZYS6shsOzRN3Ix/fDhWoMdUv2Ba9u9ZKbh/QTQH3cywwcAAlYHKFeTOF6bKJn6Z8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=Vm0Atvy4; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=F4FrEC8s; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Vm0Atvy4"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="F4FrEC8s" 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 42E7nYas012776; Thu, 14 Mar 2024 10:38:28 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-11-20; bh=4A7L936WEHl3BkoqFC9dtLiQI2u8LK782v1ZwTZwPi0=; b=Vm0Atvy4c6czWBFMBfo/F7EvdSEDF/Eu70Tt8+MhCMu2vBrqM7Fx9mrWV3XLgIDZVMrC M5XxsiyixXxGgRF/CmYS+CoVnEnupmW+tIDp52pWuNXOIMXLcdQh1KlMj08dw1MugTfP U8vOR5oL6KPK7aXybs31foMyu02dAY5g+467wKIOpbB4kdRsnlMH2Jx+Tf8PBTK0JqiT RityzKJOb+VgUlCqtSWHy8q0QxKpPVQAjYFx5wa6oL13M4AfcUBGTYwUoSL4UTIz6wiu w0zpEaE2uJWN0AaE3gRHLmEe9pTwsMBdUST7CS2UPMJpZjaV7eaPQmyWGyTLOvHaf9Yd tQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wrepd32jx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:28 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 42EAQacA009124; Thu, 14 Mar 2024 10:38:27 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wre7gdvag-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WwjyfYEOqB3sBrIn5/Vx8CZaKBQe13eTU91IbyDIGKAJshIgELj2E/cAhXzvdcHnZg0bMzvux8BRuDuurAB6+VjpOvRy22qDJ3CZcREO6uUkvsfewcDN7As62uwddt19AbW1NkPzH5VddMzCTopW8rnTu/UgOhv2cVr4mkXcxbpMhXnFsgeQCz7SSjQ51+XbD5beGio4OmP6Nhax4j1CY9VpSyFfQCCwgIDFWYaBl8u5nLwLvbbplK4Vlm0GQU8CqetFB6BAA9cqsHRdYW+BtHf8ID/lJkGaqgzwM+gL7WEGVa2pDX/k10/hh1q4ejSw6Pa1XQU2NyCkCsQ6HUZMxw== 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=4A7L936WEHl3BkoqFC9dtLiQI2u8LK782v1ZwTZwPi0=; b=oTGsMQVsSrUL+cf144y+fB1eIcZ64wwOb3fTFF3ACg8rHqhSNM5XAICmBF7FZ7aO9gj9FhYl39WVl1uIfmVIDj4tXhpt11cGfppJHj1rFz4EWLaqrNPPMmTyJuNFpQT9DUd5fSJKmeflzkDIQAtHYaDcU2ZlzKJoncG1CO8YzuEiG0UhUaOAYZ866Dyw9z7+nqr4yCqCdJd1Z9Q4xcT7n2SVPhEGawsaTkyM/BebOa5V2oovuNQ3ewE4UOf7hKbwCRGOykDCYRECrw1Vih/GBbpFI4gKkUFeQp5boQwOUc1CUGG6fOOuwSsGpHM67onDlVABtDuyIEip/gYEl/rVEA== 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=4A7L936WEHl3BkoqFC9dtLiQI2u8LK782v1ZwTZwPi0=; b=F4FrEC8s0mghkp1U3+Lz1G+SlFiEMJC0fiY7IpPH9GjKOzr65V+p4iU8b0UaNOSPs5dGYlWbAanDqC1K8gI22uRupAomgzWZ0hNM/YHZ1uLazZGYcfEJh/eoPbLABcjQqOfa8GipBHpYEPiVoyO1j61L7bWQG7/qDMMi5Ar9SKc= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SN7PR10MB6617.namprd10.prod.outlook.com (2603:10b6:806:2ac::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.20; Thu, 14 Mar 2024 10:38:25 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b%7]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 10:38:25 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, boris@bur.io Subject: [PATCH v2 3/4] btrfs/277: specify protocol version 3 for verity send Date: Thu, 14 Mar 2024 16:07:39 +0530 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: PN3PR01CA0043.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:98::19) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|SN7PR10MB6617:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ff2fa10-96df-46c6-7ab6-08dc4412e0c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vk49n9UDnGHmzqU1pPuKwCJ3g5pqlozVbdQwwBjLKbhtjKx576hxU6o3zNQs3VPPvzVB7AreCwD/wOBYlcgfJO+huRXKEow7UGkxbG1pQSH7uEAe32t6GdMpGOHCWOhO/3SR+7RFJ/EJYnwP67w4ALFwlosD/x3Vkrjxrj5OVxMgA+8b3DS2tUr99bty6kt+wFDQMGWVW8JCJkIH3d3SlSpk1D8zCIPCDh5d11bCJ3+NhfXa/c72h9zZYb50zwnPTJvbD+aACnsv6bZdiITxGW/y8gFV7fdMYDkbUii4frbOM9vvrirFWAweNbdks7GRcFQgOACkRijVkka3KFcBw/4SrpUOKOTz9IUuetm/wsAZ6/3o6rFDoeo1mfMnVCLXGm2bIdnoDxU2/lDJw/qP8mtHPi103chPeS/Y8q9cstYwCdQnLAhMmjYFWZ2LGE0Rc14rTl0tK9gafJXV3ui6hJm2LGQeoxiG9xMhlaRwF0kbBBzihP/phxfQ/4h8E8BuTSBSovMCv20B3uGrGcZlEpCvntw+7MMxP5+DoASfQ9H8QNbIzJ40UFB46R/oiYlfQzUbi11w3LSPvVk5NTsgYQheGe51KN31nIQpaJZ4qbByiea/qfGSkfBq3EG5ziwPuvkEZzo7iFU1x+onFWwzENOUi++i+/IkDrHScRhUP+M= 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)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BREJj4JoO7y/b4eq+5xntMkxmWgYxxnBShznq/vnlaE/Ghe/hQfpX0ofo53ZHqoJ1vS3FFhZ6Xjl1VlV6vnbASyUWHqhn8N8aqlZRj7XV8P8Edn4KNC9Oorv1n18EGpphkdmYy2s+bmPdWHgbDkejO5aKYMbEAjB/bNOpakafp6EbR6TBCoJRasxNofxtjtVscka7/1kdbW2Shr8gwfLA0zTa0nzZFR881P5Myxnq35eRkzChRZxTVQiBR9Bki06x2FnOTEgnWNYd7wf1rEieo72CTTJrDcSv3mL8aLFnVPTdp1h0c/ijHYVAzfdMMahoSTHUjYD+B+r0zyk65oz89AiRQEExU95a7mKa3LCgT3VHKAiewRBEZ8IXom4Z4Np4u/rqym8ls0zxJzxrB9dGoXEQSvlUjgx4GDMKhDyz2JgA8X4pPPyoJwNwRq4zUYYNUuawtJdn1MVfpwQkzlzbMvF9FnTXV6i4WqRBD95HKVCvNlZdBuTSIm6bO4pVrmVX9LS0rxmZZ9KYrqo5xMkORj/WlFKgohkBfH304a678R5kpHbEaGJQw2glMoKVN7pP8YtHBwbUZ/SKEI1807TzdM/3Z5Smm8dKF6BcejI18zItHBmqbnfisLUOmyNC779shQiNtPWrOwbg5XXlO5xlQZlR/9UzcR5f8ztsfd5FoXRAtwye/DdvlAFXLNHL76JW15HU9TWN7y7K1OpAIMndkZ7Dt0iqQe4uM2Sa3sgO4PNIOHkQeaMUhFksqwGmlKTnwrIWP+QumQPdcJnpCMyaGhzA5SMdtmlH6elTdbaCSEEPbWWKyTfqbpCIE7jfM60Cf96YUGgZEIZLp9wuLfrdIE6JOq6UEA+fSj15Pb5quejEMXacRWXQMpSF8QSNLQjpNsu5EBALXzReakpMpvJJuQJPdCoqgczMV93K7wiiid2fDvKGZ/Sie6ShWu56XLZ/Mv4d6MXAHfQ9BOkYYMs+mXfH45HXdsaLUyp83/DO6vG9qX+VPLGlec1WPxeeTSfWmfKGmWltMWAW5zXbpQsTqlE3MNTVoAxhj9ZqTSeEJsOdOkZ2O7dmjVOdaLli4wCpNQrKpTur4flJ+WWtOXfyOe6k0kqnQyso4InqncU/ykA+Pb7ZYrwbqyojWCQrCJXfBzLb/kViTlDD0ju+5pLmgXHfqPMUp43MPMM9sA2aEdJu7fzsUd8R+NHXfYTTo+12Y+75zKrwznSJJ6e/D/ljYo+S4RJky/ZAXlXmboSgIBOQI2iLWI8FwUhGDf0wspRIJ/iF7RneFgBTBa4AJwWrLPL+MKGDW6YTTbGkGg+7mSxB5ZEJEAq4nZemrPcpQM+QAU91LWzav1LIQWNa0qOTGtOKGWurmEI5kkR5Cz753vZ+O0Ug7mtKzJFiFl+hdzwtd2sGxYkKRF2jJWix312GWebgK3MY5ffKfh6rvh3dpo2VUX3M9vnLuvVVsdjoWS7NVVMLxC+BaKrsCe2al95p3YYKmps7JQ2HbvCKOzj0OQEgBjSEskC0PfBqC7Tc7dtDrHDKjne/6m0qQlKjXVsls12jLYdIHrSi6lCMIzTT9bSMcDLomy9G4UGXriD7uWm X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: G/zG805s6DDtDtx3f9S/rAEk7/YkHcctjJVYDJi4wP8gg6PqT1FgJRE/s4XrRHw0dkgkRBORKnh3WORhFlwldvnllnOkDQISyBxzScPTSCiDKrm3FTZ8PuWtz6OyNRCWJV7a1yAd0u4eOkzeta9Qp9FYBCJGEyP8Nt00UHuqaSpEXV3tebzC9ctsNMm71dhvoz3tjmAUTTd9MYkgyOuRIbp4x1cso7KHoAZK1uUlviahXoBwb686s2rQ0WdmS4Mr8Bv2dqOV80ycNfur2p5BHoq51sjnhNP8BXdHmqHfQ/v5NxlLV/hJygLZS578gnC+yBAq4MeXW7WZJfFAk3m/DSt1QxRPJoVlEb+hy4xfPGJtGEUu2WLCv+XWb4Ig8zOHp9e+8VtGwLBwcu7CqAIT67yLH5cd6WUuiXd0HOSQ867C4sx9TSinGs5fwvl8wSCY94l89pf0XGuXPh64VkN930k2t2HmXjZekEy8pnUoLmnnbYWyeh0KRxQ5br0544iKM+mrYg8Vnbxfj5n54YeMVAh7hi1Gj0Dj4ZIcVAReCwGnQGxKDOM8mO7SXREsjHkm2stO48boHX84Qs6gzhEylP856jRHTLOxKXYXxGN1Xow= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ff2fa10-96df-46c6-7ab6-08dc4412e0c7 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 10:38:25.4001 (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: bnbRE8WU+nK1opxxKGO+FmGdnqZiT/Kt1oFeliiNDnoRhmYnEtxDsuVLLvOhuYSBz7/S1HD/+xZBJKww+nER8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6617 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-14_08,2024-03-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 malwarescore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2403140075 X-Proofpoint-ORIG-GUID: FjPsJBXr-dEwFFPdh4Na9x5_6ko1K1iY X-Proofpoint-GUID: FjPsJBXr-dEwFFPdh4Na9x5_6ko1K1iY From: Boris Burkov This test uses btrfs send with fs-verity which relies on protocol version 3. The default in progs is version 2, so we need to explicitly specify the protocol version. Note that the max protocol version in progs is also currently broken (not properly gated by EXPERIMENTAL) so that needs fixing as well. Reviewed-by: Filipe Manana Signed-off-by: Boris Burkov Signed-off-by: Anand Jain [ added _require_btrfs_send_version 3 ] --- tests/btrfs/277 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/btrfs/277 b/tests/btrfs/277 index f5684fde1b90..5bb7ffabdd2f 100755 --- a/tests/btrfs/277 +++ b/tests/btrfs/277 @@ -29,6 +29,7 @@ _require_scratch_verity _require_fsverity_builtin_signatures _require_command "$SETCAP_PROG" setcap _require_command "$GETCAP_PROG" getcap +_require_btrfs_send_version 3 subv=$SCRATCH_MNT/subv fsv_file=$subv/file.fsv @@ -84,7 +85,7 @@ _test_send_verity() { echo "set subvolume read only" $BTRFS_UTIL_PROG property set $subv ro true echo "send subvolume" - $BTRFS_UTIL_PROG send $subv -f $stream -q >> $seqres.full + $BTRFS_UTIL_PROG send $subv -f $stream -q --proto=3 >> $seqres.full echo "blow away fs" _scratch_unmount From patchwork Thu Mar 14 10:37:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13592320 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 70F911A38FC; Thu, 14 Mar 2024 10:38:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412719; cv=fail; b=jMYjHSd2mgDp954Ha2i8965NF7Me+WQWWpeWEhloM5aYsKa/FQO1SUDhhKwGiA1J6BpofGkQNyo/Q5BDcCX/9ZCxNLHHTdeBxLcIqNnxGxoU6+R9c9VDxXGdrKpMexGKPVmUWvY+fx6jQR5sNQ0bkjFkvSXRpA9hg7qywtWB7fs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710412719; c=relaxed/simple; bh=/glBAPgd8NMjUDTHBrtVjvgi9wX5gifjzApRteJhoGU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=GH7rmggjsgLhxH6jGoBzjEB+vec5hFXNLvfOb+Vsx/vgQbGA7v8a/vajtg3XgicQRCBwfBsGM4iWIpMqA224Rxv3SUU4totEtcA19UZhjqc8oNEYClLz1iD7itVxsvaYvbk1irbCDIyMUVRaLZovdPdHrfpr5CuxIhYVGWqxyCs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=TmcbaJ8+; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=zPr+Exvg; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="TmcbaJ8+"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="zPr+Exvg" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 42E7mwNC023820; Thu, 14 Mar 2024 10:38:35 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-11-20; bh=rnPqPAxSiJuUvt+jgx8Kb9cGSLjDJzzb0ariM2sFOuo=; b=TmcbaJ8+lqTX2OLMHcyHec531/yQazv3qoE1gdTCuoQ/8FJ/RhpT0LJR2ZuZ5Uwg689Z swErv9UxT//qQvob5G5QyfxyfSpd+OtnrF75DvHGAW2iSRQuDmyTxBqX3Bq7NHDvQ2iX 5eE5mVJl8/E71VPnlS7MSYryjMOlAnNrOUZ81L49VtbVg2DA+iap+5Bz1Q3jE/wCL72L JEx1/pIDjSpBHxkC9RC+DE9B4l9wByXXfeyLX/S5MsMQMquK+zG+oL3gezyR5onfQwE+ 04Tg2Gwx72uxiMf8YNKF1WQrkR1TSv3gQRLCJv/Tea3PcSvu46x9c8x01ptqSCbC2TLz eg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wrftdkap2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:34 +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 42E9H4aq033726; Thu, 14 Mar 2024 10:38:33 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3wre79wt0d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2024 10:38:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a/PB5tcJ7oVP3OTAZKtOmjhMD4gN7y+y/CcrgY01bjeoPd+LhQHp+eHao1We3XqV5v21YtHZdZNRrjjBi9gAsw6tqoGTM7l4NXjBsn0JbnAREVyi6QoiOUiUCWgH6Qiv+XA9neY+s/2Fujcs30F1Iwf7VMcHZZABbqJZteJBdO5hfrOA8svDMw6XxHYpL+j6nqJwUJIcw7DK0HwT4SqF3zHsroN0EXt1p8CDT2PKybIUxAcBr55EZRBdKsInVxR0U4bHQEh8+eFvOOmKlY2i9w6tdvcrRvpsXu1djTF3SppIndX2yZYMhGrpCGG00YYEGG8G5n4HhO5m0uCRV0m3iA== 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=rnPqPAxSiJuUvt+jgx8Kb9cGSLjDJzzb0ariM2sFOuo=; b=EP+SUAJNztxc1GLL2kHl3OTxoeWfjNjjEWQbblF0z02WwhUeNfegh6mdgswj2BoGEsweAX35jBD0og1de58WncAZl1lMzJ5x8SVu2y+QjVjSR71Ba+NO2NS2RAw+ATc3U3ruuiWZO896CunlLDSCHdhQnarwSN+j4N9k9Uske1IqF9xZxkCBwVU5j0KCUThHzA2RHVGCq0jORzc3v7Le6fhePsbWEaRt0rvRp4oPnj/CPG0GjpOuLmOrdAIRg4njtKdhEsuI+0ENVRs0SBiFTI5e3e85u+8nMOSGxFX4TxE1lyjglqoDPAyxzW6N6hHaF8nrUt+eT5hQrOE+PL5Oig== 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=rnPqPAxSiJuUvt+jgx8Kb9cGSLjDJzzb0ariM2sFOuo=; b=zPr+ExvgOa/yqctSRutefZIjvSiUALLQQjWhFZq+5hR+eLIAeiagYwoMXtljpaGwnACKgre4CI3Tyrv9arL1OV9VKp3BOBN5FlnpXz1AW90yUF1bUL+f6tFd+xrwWc8avztIpVpB+GmAzwBLAkLmeY9J/NvUQmQN7AuZhb994v8= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by CH0PR10MB7461.namprd10.prod.outlook.com (2603:10b6:610:18d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.20; Thu, 14 Mar 2024 10:38:31 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b%7]) with mapi id 15.20.7362.035; Thu, 14 Mar 2024 10:38:31 +0000 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, boris@bur.io Subject: [PATCH v2 4/4] btrfs/316: use rescan wrapper Date: Thu, 14 Mar 2024 16:07:40 +0530 Message-ID: <4937bad16d08994373481b2c60577e46d25c07f9.1710411934.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: PN3PR01CA0059.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:99::13) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|CH0PR10MB7461:EE_ X-MS-Office365-Filtering-Correlation-Id: 19b0a6eb-d507-40e6-98f7-08dc4412e4c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XuYqqGwtRqIzYCobEG54sbX0ebK3g8Jq/vW6i5dP5nNQwyIchIdYF2nMxoDeSFYcPY/cHS/xjEZQfkmHTk3efRaqUpC7j8WOCtLszUGvY77VqnE0KKNZsh1hDDWa0cKzjFUEvqeQTXofmt50OYX0pK3nqOsMkuphBDIk5VXOSACYDHFH6GO++dO8bNMYVGtlvdw4cMZHMCnTWqxEQPxKMHWXAbs/yuW+QJQhKWuXPZkjsgznx479qUiAIeauBquVx/LoliNraOBpwdlbvnLn0C1svPHmpUEufGWPgpeM5ma9ioQ5GJg8mGQTXMrQg4fXieCo60VtWFFqG0xNmA31SP6oCH+o/YEKsJXAMNe0c3ml1xH2gYi7rf86if5i/VVX5su3Q1TYL7mHc/PpGMXh41cMOfcBl6cRBJ/4UY4hJWFhDMxNmBFdcVxhMZb7pf6svPNpYv7dbsbter4SZseJGCmBA9e1P1yjVEmd/TFtpxNIjsYG0SmCraj4lkyomYg5X5RTBA303ewlVovN7AgxIljMucz96zw+bpPkhvPitHC5KQHOISjhNjxiGhv7IiM4+pOfG0ToWh96lwJkECh/wmhy9GJi+ST5iQtPwH/8DCJkQczmDpK0KDcgiNaO48SFk0sWht7XoVbkJwSGYYqtx27M32sITeFI3gIvsjS4NPY= 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)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aqJfTAgDgCuSPOFyjNN1oPYRmfTMgna6SNfykiOzMvdrfOogn9ySrZ+Hnpn8+9cszM5Jla7n67q36x6VOJUG2p+HJ4iizysrWXQdS8h1UK1iMZtQ8u3a/H7wtDBi7geIF6z4pDjRGSUybLhRePjXgBlUBfeUn23yoeSRN0jx2PDmd9bFevOtjjrhHvzp9KVIT4J5crbqOFAzrSy9tS/HxHzeerh37vRMuqmgjrB2kiHE4A8rETKtt66ZPdgtHQpxHR4qMPNW9g4aCnQnViN3tHA0zJICTHxklw1jSgOVjbYO+nLEAavbD8paQjBOgSGsCUGoONo3eaxMloe5TOZ7iR172qWkSULUoHUIgcQTkJIevXqvzkXLmgm/z4elN/2HTrVoEF1uoZUTHs4SE8W839EGYaawVpbv7GXtK1MG5SUTIM82Bdn5UdAXZ8MM53TyIY2Ea5/stBfCsBDdNasVIp9x2TKhyjyM6nJ6U3ZRCzjdzbauoyk3INpoGkxlvbiIVUvWD0pgXcRIlQJ7nk+/nfw98RoZzdGx+h+ZOTBTkXnrzIXjAhV0IVQaBBM2pLZxEEAg4r3fhek5qhCQV0GWDUrNL7EafdT1r7cGnqfonvv0eYScxPN8bECX1VxBKOvnRZbo8pJLpijo4y4O1TBW5GUXgJYRsa9O7dd5Hzmep1Jf53a98ZJSJl7XPnFVroSsjsB0exQ5FYpLuXEyBU9pQvqtkDX2eO9F/dmjpRlBavP4XqWq9AVdYIpRJ/ZvDdUzXZG845BBPmFpch6nG8pt+bI1jpPzw+1c6Kyb5FoBpU15F+V1yeS9hM6iEHUj5DnBAxqIgmWqfB7kqiH9QctfnGuFQpp4O0t+SHFXXB0R4iZUcM0qAZrwWzJN/GNhs7Bt58KMP+/xB0fvTio43RTQC9XJ2GGbru2/46rTzdyLv/NOFs1pSycoOkWJbZOSLnHcG+9VAn96erFcGT5OmjMq3eRxEXZrNsjV30AGyszblf7VYWlsARj2Yxa6QKljqLDRv+XnnC92CSty1eVvQq3OM6VGHz7AeqJXeiKpuDVVgKbKuzVzoOIiCK4EaE6dyXGBw70eZFB/j3LiXtdt19qr+zHqbeVOU/K8iyEJ8M3qnqocUKe72cPnI2+4fn3tiqOy/a7avVyAF1pgiZaMcUUE2k231fMp2O6CeTjlpCrEwNdPIT4ctO50/N8+PQ6k/fCxFxTHtkOdGxGZVhDz1hCUh8XszEzQZla5RCMYMAPKIsVjXFApmv8HMUlPB9m3yLoAHCPxzgLZj2EZUHMdc8rQDUbD/d8AcqqnnimPMxeyxFgXVP/R/IJgg1R5+D+3o1tDnlNy0ISF5UePjXkr4CaKzqsKOp5J1/rIE3ddA4IEeG9qzcoMAs6xt4EcqGHA3NP0f9l29adTV+3iPcCFA2jR5E3d0mpAGHY408j9O4jAuiXYXHOwBr5zN/TWnyFtUVCBoA+FlADZEJ9U5UjveiXUZCUD5bOWX1woZItvyHUIyTyuHcwmEM0/eCRxxBxsE+zzGFuYjCG/YarSa0vX+XcqU3AbT1teC/QTQw4Flw8/2945lrLw8+FaikVueeJIZKfz X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: jDjL3N5NXtwrctYmOzw0z5HyFM7CJOKXqVDYYrL8928Idg3osUc9aDphty9hQ7vFNCqHinxcsXkSWoIPFf10j7ELguOFSmBDwZnogep45/4cJ8T10mL2MBgdI1Glq6nh0xAq66/DD1YNgzAxWloA38Vk53uhNKqTFejX7QNqJsQ32E2nWfKHdxcqSmjycZfuiOEmGMTxJZBs+4W+nNdZcrI2angSag/yjDW8f3xpy+OvH6+eFd9gcqxgFc64rk967bxdCkN6q7Efzb+EJIWoU1pJ9I9hqVEooqbdphtRFfFeDJJhnnhX/SIizRaGMc0SwEb9MqzqeXxNqU1EiZxKcYnI/R37zVwT7Gk/RX8FOZ+cD0DhFTwidRq+20VzO9DWNc3Q1SoUPrCiiFHq4l1maH+Ei45yUmukMlLQ41FqAN7JVpklxkDDCJ9MJ09VBO/7NscR04dumrSazOur5g17O1b+NshhWkGV2vUbNBzGAbRkBZEldPHHwA5ZB05+4lmlKIGpK+4LFfy+J9WlnACOSuj8WcD7BhYLJgXkzEmzYlDXI5TBz/i6JKNyNKTRjbcQ0MlrYOPvixptwvA1cq1BHsE25Io7SnwuuL3oBRTGNYo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19b0a6eb-d507-40e6-98f7-08dc4412e4c3 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 10:38:31.8828 (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: E800GvesLouJDz0wq7A5wThMDhHSzEsBwI6DG4hxDZ5/E/McUvn2FpO47XaGGHw/+8iwFNMOPnVacPKWyDCjIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB7461 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-14_08,2024-03-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2403140075 X-Proofpoint-ORIG-GUID: JxvtVFZSBef87f19AgrzoWWg_aMvQpig X-Proofpoint-GUID: JxvtVFZSBef87f19AgrzoWWg_aMvQpig From: Boris Burkov btrfs/316 is broken on the squota configuration because it uses a raw rescan call which fails, instead of using the rescan wrapper. The test passes with squota, so run it (instead of requiring rescan) though I suspect it isn't the most meaningful test. Reviewed-by: Filipe Manana Signed-off-by: Boris Burkov Signed-off-by: Anand Jain --- tests/btrfs/316 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/btrfs/316 b/tests/btrfs/316 index 07a94334a9ef..5ef3ebe9f9e7 100755 --- a/tests/btrfs/316 +++ b/tests/btrfs/316 @@ -16,6 +16,7 @@ _begin_fstest auto quick qgroup _supported_fs btrfs _require_scratch +_require_qgroup_rescan _fixed_by_kernel_commit xxxxxxxxxxxx \ "btrfs: qgroup: always free reserved space for extent records" @@ -24,7 +25,7 @@ _scratch_mkfs >> $seqres.full _scratch_mount $BTRFS_UTIL_PROG quota enable $SCRATCH_MNT -$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full +_qgroup_rescan $SCRATCH_MNT >> $seqres.full $BTRFS_UTIL_PROG qgroup create 1/0 $SCRATCH_MNT >> $seqres.full $BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subv1 >> $seqres.full