Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- daemon/btrfs.c | 32 ++++++++++++++++++++++++++++++++ generator/actions.ml | 10 ++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 6dde36d..1053b98 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -1470,3 +1470,35 @@ do_btrfs_balance_pause (const char *path) return 0; } + +int +do_btrfs_balance_cancel (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, "balance"); + ADD_ARG (argv, i, "cancel"); + 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 b0b2f22..17dbd78 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -12298,6 +12298,16 @@ Resume a previously canceled or interrupted scrub on a btrfs filesystem." }; longdesc = "\ Pause a running balance on a btrfs filesystem." }; +{ defaults with + name = "btrfs_balance_cancel"; + style = RErr, [Pathname "path"], []; + proc_nr = Some 439; + optional = Some "btrfs"; camel_name = "BTRFSBalanceCancel"; + test_excuse = "test disk isn't large enough that btrfs_balance completes before we can cancel it"; + shortdesc = "cancel a running or paused balance"; + longdesc = "\ +Cancel a running balance on a btrfs filesystem." }; + ] (* Non-API meta-commands available only in guestfish. diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index c8eb588..99dea3b 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -438 +439 -- 2.1.0