[Libguestfs] [PATCH 14/16] New API: btrfs_inspect_subvolid_resolve
Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com>
---
daemon/btrfs.c | 41 +++++++++++++++++++++++++++++++++++++++++
generator/actions.ml | 16 ++++++++++++++++
src/MAX_PROC_NR | 2 +-
3 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index c6ca3c3..4a6871c 100644
--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -1737,3 +1737,44 @@ do_btrfs_inspect_rootid (const char *path)
return ret;
}
+
+char *
+do_btrfs_inspect_subvolid_resolve (int64_t id, const char *fs)
+{
+ const size_t MAX_ARGS = 64;
+ const char *argv[MAX_ARGS];
+ size_t i = 0;
+ CLEANUP_FREE char *fs_buf = NULL;
+ CLEANUP_FREE char *err = NULL;
+ char *out;
+ size_t len;
+ int r;
+ char id_str[32];
+
+ fs_buf = sysroot_path (fs);
+ if (fs_buf == NULL) {
+ reply_with_perror ("malloc");
+ return NULL;
+ }
+
+ ADD_ARG (argv, i, str_btrfs);
+ ADD_ARG (argv, i, "inspect");
+ ADD_ARG (argv, i, "subvolid-resolve");
+ snprintf (id_str, sizeof id_str, "%" PRIi64, id);
+ ADD_ARG (argv, i, id_str);
+ ADD_ARG (argv, i, fs_buf);
+ ADD_ARG (argv, i, NULL);
+
+ r = commandv (&out, &err, argv);
+ if (r == -1) {
+ reply_with_error ("%s: %s", fs, err);
+ return NULL;
+ }
+
+ /* Trim trailing '\n' */
+ len = strlen (out);
+ if (len > 0 && out[len-1] == '\n')
+ out[len-1] = '\0';
+
+ return out;
+}
diff --git a/generator/actions.ml b/generator/actions.ml
index f5c4c68..56071cc 100644
--- a/generator/actions.ml
+++ b/generator/actions.ml
@@ -12407,6 +12407,22 @@ Recover bad superblocks from good copies." };
longdesc = "\
Get tree ID of the containing subvolume of path." };
+ { defaults with
+ name = "btrfs_inspect_subvolid_resolve";
+ style = RString "path", [Int64 "id"; Pathname "fs"],
[];
+ proc_nr = Some 447;
+ optional = Some "btrfs"; camel_name =
"BTRFSInspectSubvolIdResolve";
+ tests = [
+ InitPartition, Always, TestRun (
+ [["mkfs_btrfs"; "/dev/sda1"; ""; "";
"NOARG"; ""; "NOARG"; "NOARG"; "";
""];
+ ["mount"; "/dev/sda1"; "/"];
+ ["btrfs_subvolume_create"; "/sub1"; "NOARG"];
+ ["btrfs_inspect_subvolid_resolve"; "256"; "/"]]),
[];
+ ];
+ shortdesc = "get path for the given subvolume ID";
+ longdesc = "\
+Get path on a btrfs filesystem for the given subvolume ID." };
+
]
(* Non-API meta-commands available only in guestfish.
diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR
index 0187835..e9b7520 100644
--- a/src/MAX_PROC_NR
+++ b/src/MAX_PROC_NR
@@ -1 +1 @@
-446
+447
--
2.1.0