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 c32d1bb..167dd49 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -1407,3 +1407,35 @@ do_btrfs_scrub_cancel (const char *path) return 0; } + +int +do_btrfs_scrub_resume (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, "scrub"); + ADD_ARG (argv, i, "resume"); + 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 d1d0e92..c77c250 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -12277,6 +12277,16 @@ corrupt data." }; longdesc = "\ Cancel a running scrub on a btrfs filesystem." }; + { defaults with + name = "btrfs_scrub_resume"; + style = RErr, [Pathname "path"], []; + proc_nr = Some 437; + optional = Some "btrfs"; camel_name = "BTRFSScrubResume"; + test_excuse = "test disk isn't large enough that btrfs_scrub_start completes before we can cancel and resume it"; + shortdesc = "resume a previously canceled or interrupted scrub"; + longdesc = "\ +Resume a previously canceled or interrupted scrub 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 246662b..ce9cd49 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -436 +437 -- 2.1.0