From 7211aac047a10457650dad1da02383cfb8d24abb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 7 Mar 2024 16:38:39 +0000 Subject: [PATCH] tests: btrfs: Don't try to create qgroup 0/_ This used to work in kernel <= 6.7 but has been forbidden in later kernels: https://github.com/torvalds/linux/commit/0c309d66dacddf8ce939b891d9ead4a8e21ad6f0 Reported-by: David Runge Thanks: Jan Alexander Steffens Fixes: https://github.com/libguestfs/libguestfs/issues/136 --- generator/actions_core.ml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/generator/actions_core.ml b/generator/actions_core.ml index 80c830239..4f78a0d26 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -8811,7 +8811,7 @@ Limit the size of the subvolume with path C." }; ["mount"; "/dev/sda1"; "/"]; ["btrfs_quota_enable"; "/"; "true"]; ["btrfs_subvolume_create"; "/sub1"; "NOARG"]; - ["btrfs_qgroup_create"; "0/1000"; "/sub1"]]), []; + ["btrfs_qgroup_create"; "1/1000"; "/sub1"]]), []; ]; shortdesc = "create a subvolume quota group"; longdesc = "\ @@ -8827,8 +8827,8 @@ Create a quota group (qgroup) for subvolume at C." }; ["mount"; "/dev/sda1"; "/"]; ["btrfs_quota_enable"; "/"; "true"]; ["btrfs_subvolume_create"; "/sub1"; "NOARG"]; - ["btrfs_qgroup_create"; "0/1000"; "/sub1"]; - ["btrfs_qgroup_destroy"; "0/1000"; "/sub1"]]), []; + ["btrfs_qgroup_create"; "1/1000"; "/sub1"]; + ["btrfs_qgroup_destroy"; "1/1000"; "/sub1"]]), []; ]; shortdesc = "destroy a subvolume quota group"; longdesc = "\ @@ -8843,7 +8843,7 @@ Destroy a quota group." }; ["mount"; "/dev/sda1"; "/"]; ["btrfs_quota_enable"; "/"; "true"]; ["btrfs_subvolume_create"; "/sub1"; "NOARG"]; - ["btrfs_qgroup_create"; "0/1000"; "/sub1"]; + ["btrfs_qgroup_create"; "1/1000"; "/sub1"]; ["btrfs_qgroup_show"; "/"]]), []; ]; optional = Some "btrfs"; camel_name = "BTRFSQgroupShow"; @@ -8861,9 +8861,9 @@ usages." }; [["mkfs_btrfs"; "/dev/sda1"; ""; ""; "NOARG"; ""; "NOARG"; "NOARG"; ""; ""]; ["mount"; "/dev/sda1"; "/"]; ["btrfs_quota_enable"; "/"; "true"]; - ["btrfs_qgroup_create"; "0/1000"; "/"]; ["btrfs_qgroup_create"; "1/1000"; "/"]; - ["btrfs_qgroup_assign"; "0/1000"; "1/1000"; "/"]]), []; + ["btrfs_qgroup_create"; "2/1000"; "/"]; + ["btrfs_qgroup_assign"; "1/1000"; "2/1000"; "/"]]), []; ]; shortdesc = "add a qgroup to a parent qgroup"; longdesc = "\ @@ -8879,10 +8879,10 @@ several qgroups into a parent qgroup to share common limit." }; [["mkfs_btrfs"; "/dev/sda1"; ""; ""; "NOARG"; ""; "NOARG"; "NOARG"; ""; ""]; ["mount"; "/dev/sda1"; "/"]; ["btrfs_quota_enable"; "/"; "true"]; - ["btrfs_qgroup_create"; "0/1000"; "/"]; ["btrfs_qgroup_create"; "1/1000"; "/"]; - ["btrfs_qgroup_assign"; "0/1000"; "1/1000"; "/"]; - ["btrfs_qgroup_remove"; "0/1000"; "1/1000"; "/"]]), []; + ["btrfs_qgroup_create"; "2/1000"; "/"]; + ["btrfs_qgroup_assign"; "1/1000"; "2/1000"; "/"]; + ["btrfs_qgroup_remove"; "1/1000"; "2/1000"; "/"]]), []; ]; shortdesc = "remove a qgroup from its parent qgroup"; longdesc = "\