From 3617938b4803f0871c8811b42f8a0b4c1969a424 Mon Sep 17 00:00:00 2001 From: Hu Tao Date: Fri, 12 Dec 2014 15:03:30 +0800 Subject: [PATCH] New API: btrfs_qgroup_destroy btrfs_qgroup_destroy destroys a qgroup. Signed-off-by: Hu Tao --- daemon/btrfs.c | 33 +++++++++++++++++++++++++++++++++ generator/actions.ml | 18 ++++++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 194c1a0a2..b49979e19 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -1153,3 +1153,36 @@ do_btrfs_qgroup_create (const char *qgroupid, const char *subvolume) return 0; } + +int +do_btrfs_qgroup_destroy (const char *qgroupid, const char *subvolume) +{ + const size_t MAX_ARGS = 64; + const char *argv[MAX_ARGS]; + size_t i = 0; + CLEANUP_FREE char *subvolume_buf = NULL; + CLEANUP_FREE char *err = NULL; + CLEANUP_FREE char *out = NULL; + int r; + + subvolume_buf = sysroot_path (subvolume); + if (subvolume_buf == NULL) { + reply_with_perror ("malloc"); + return -1; + } + + ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "qgroup"); + ADD_ARG (argv, i, "destroy"); + ADD_ARG (argv, i, qgroupid); + ADD_ARG (argv, i, subvolume_buf); + ADD_ARG (argv, i, NULL); + + r = commandv (&out, &err, argv); + if (r == -1) { + reply_with_error ("%s: %s", subvolume, err); + return -1; + } + + return 0; +} diff --git a/generator/actions.ml b/generator/actions.ml index 50a424c98..9bbfdb57e 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -12170,6 +12170,24 @@ can have suffix of G, M, or K. " }; longdesc = "\ Create a quota group (qgroup) for subvolume at C." }; + { defaults with + name = "btrfs_qgroup_destroy"; + style = RErr, [String "qgroupid"; Pathname "subvolume"], []; + proc_nr = Some 431; + optional = Some "btrfs"; camel_name = "BTRFSQgroupDestroy"; + tests = [ + InitPartition, Always, TestRun ( + [["mkfs_btrfs"; "/dev/sda1"; ""; ""; "NOARG"; ""; "NOARG"; "NOARG"; ""; ""]; + ["mount"; "/dev/sda1"; "/"]; + ["btrfs_quota_enable"; "/"; "true"]; + ["btrfs_subvolume_create"; "/sub1"; "NOARG"]; + ["btrfs_qgroup_create"; "0/1000"; "/sub1"]; + ["btrfs_qgroup_destroy"; "0/1000"; "/sub1"]]), []; + ]; + shortdesc = "destroy a subvolume quota group"; + longdesc = "\ +Destroy a quota group." }; + ] (* Non-API meta-commands available only in guestfish. diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index c15fb930d..ed4f16201 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -430 +431