[Libguestfs] [PATCH v2 11/11] New API: btrfs_qgroup_remove

Hu Tao
Thu, 11 Dec 2014 06:11:39 -0000

btrfs_qgroup_remove removes a qgroup from its parent qgroup.

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---
 daemon/btrfs.c       | 34 ++++++++++++++++++++++++++++++++++
 generator/actions.ml | 19 +++++++++++++++++++
 src/MAX_PROC_NR      |  2 +-
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index 2ba5296..40bc34d 100644
--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -1306,3 +1306,37 @@ do_btrfs_qgroup_assign (const char *src, const char *dst,
const char *path)

   return 0;
 }
+
+int
+do_btrfs_qgroup_remove (const char *src, const char *dst, const char *path)
+{
+  const size_t MAX_ARGS = 64;
+  const char *argv[MAX_ARGS];
+  size_t i = 0;
+  CLEANUP_FREE char *path_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
+  CLEANUP_FREE char *out = NULL;
+  int r;
+
+  path_buf = sysroot_path (path);
+  if (path_buf == NULL) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  ADD_ARG (argv, i, str_btrfs);
+  ADD_ARG (argv, i, "qgroup");
+  ADD_ARG (argv, i, "remove");
+  ADD_ARG (argv, i, src);
+  ADD_ARG (argv, i, dst);
+  ADD_ARG (argv, i, path_buf);
+  ADD_ARG (argv, i, NULL);
+
+  r = commandv (&out, &err, argv);
+  if (r == -1) {
+    reply_with_error ("%s: %s", path, err);
+    return -1;
+  }
+
+  return 0;
+}
diff --git a/generator/actions.ml b/generator/actions.ml
index bb03112..11ade18 100644
--- a/generator/actions.ml
+++ b/generator/actions.ml
@@ -12216,6 +12216,25 @@ usages." };
 Add qgroup C<src> to parent qgroup C<dst>. This command can group
 several qgroups into a parent qgroup to share common limit." };

+  { defaults with
+    name = "btrfs_qgroup_remove";
+    style = RErr, [String "src"; String "dst"; Pathname
"path"], [];
+    proc_nr = Some 434;
+    optional = Some "btrfs"; camel_name =
"BTRFSQgroupRemove";
+    tests = [
+      InitPartition, Always, TestRun (
+        [["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"; "/"]]), [];
+    ];
+    shortdesc = "remove a qgroup from its parent qgroup";
+    longdesc = "\
+Remove qgroup C<src> from the parent qgroup C<dst>." };
+
 ]

 (* Non-API meta-commands available only in guestfish.
diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR
index 21fbd2e..e828e5d 100644
--- a/src/MAX_PROC_NR
+++ b/src/MAX_PROC_NR
@@ -1 +1 @@
-433
+434
--
1.9.3