search for: do_btrfs_subvolume_snapshot

...4 ++-- > 2 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/daemon/btrfs.c b/daemon/btrfs.c > index 7a4d43d..b630bce 100644 > --- a/daemon/btrfs.c > +++ b/daemon/btrfs.c > @@ -208,7 +208,7 @@ do_mkfs_btrfs (char *const *devices, > } > > int > -do_btrfs_subvolume_snapshot (const char *source, const char *dest) > +do_btrfs_subvolume_snapshot (const char *source, const char *dest, > int ro) { > const size_t MAX_ARGS = 64; > const char *argv[MAX_ARGS]; > @@ -231,6 +231,15 @@ do_btrfs_subvolume_snapshot (const char *source, > const char *dest) AD...

...btrfs.c | 11 ++++++++++- generator/actions.ml | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 7a4d43d..b630bce 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -208,7 +208,7 @@ do_mkfs_btrfs (char *const *devices, } int -do_btrfs_subvolume_snapshot (const char *source, const char *dest) +do_btrfs_subvolume_snapshot (const char *source, const char *dest, int ro) { const size_t MAX_ARGS = 64; const char *argv[MAX_ARGS]; @@ -231,6 +231,15 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest) ADD_ARG (argv, i, str_btrfs)...

...mon/btrfs.c | 8 +++++++- generator/actions.ml | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index b630bce..a20afca 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -208,7 +208,8 @@ do_mkfs_btrfs (char *const *devices, } int -do_btrfs_subvolume_snapshot (const char *source, const char *dest, int ro) +do_btrfs_subvolume_snapshot (const char *source, const char *dest, int ro, + const char *qgroupid) { const size_t MAX_ARGS = 64; const char *argv[MAX_ARGS]; @@ -240,6 +241,11 @@ do_btrfs_subvolume_snapshot (const cha...

Hi, This is the part1 of improving btrfs support. This series adds missing parameters to btrfs_subvolume_snapshot and btrfs_subvolume_create, and adds two new API btrfs_subvolume_get_default and btrfs_subvolume_show. Other parts will follow. Regards, Hu Hu Tao (6): btrfs: correct words about subvolume and snapshot btrfs: add optional parameter `ro' to btrfs_subvolume_snapshot btrfs:

Hi, This is the part1 of improving btrfs support. This series adds missing parameters to btrfs_subvolume_snapshot and btrfs_subvolume_create, and adds two new API btrfs_subvolume_get_default and btrfs_subvolume_show. Other parts will follow. Regards, Hu changes: v2: - add 'once_had_no_optargs = true' for btrfs_subvolume_snapshot and btrfs_subvolume_create - improved documents

Various changes/fixes to use smaller stack frames. Rich.

...,7 @@ do_mkfs_btrfs (char *const *devices, char nodesize_s[64]; char sectorsize_s[64]; - ADD_ARG (argv, i, "mkfs.btrfs"); + ADD_ARG (argv, i, str_mkfs_btrfs); /* Optional arguments. */ if (optargs_bitmask & GUESTFS_MKFS_BTRFS_ALLOCSTART_BITMASK) { @@ -225,7 +230,7 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest) return -1; } - ADD_ARG (argv, i, "btrfs"); + ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "snapshot"); ADD_ARG (argv, i, source_buf); @@ -261,7 +266,7 @@ do_btrfs_subvolume_d...

...optargs_bitmask. */ int do_btrfs_filesystem_resize (const char *filesystem, int64_t size) @@ -259,6 +264,10 @@ do_mkfs_btrfs (char *const *devices, return 0; } +#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40800 /* gcc >= 4.8.0 */ +#pragma GCC diagnostic pop +#endif + int do_btrfs_subvolume_snapshot (const char *source, const char *dest, int ro, const char *qgroupid) @@ -715,6 +724,11 @@ test_btrfs_device_add_needs_force (void) return strstr (out, "--force") != NULL; } +#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40800 /* gcc >= 4...

...,7 @@ do_mkfs_btrfs (char *const *devices, char nodesize_s[64]; char sectorsize_s[64]; - ADD_ARG (argv, i, "mkfs.btrfs"); + ADD_ARG (argv, i, str_mkfs_btrfs); /* Optional arguments. */ if (optargs_bitmask & GUESTFS_MKFS_BTRFS_ALLOCSTART_BITMASK) { @@ -225,7 +230,7 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest) return -1; } - ADD_ARG (argv, i, "btrfs"); + ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "snapshot"); ADD_ARG (argv, i, source_buf); @@ -261,7 +266,7 @@ do_btrfs_subvolume_d...

...size"); @@ -169,7 +162,7 @@ do_mkfs_btrfs (char *const *devices, return -1; } - ADD_ARG (argv, i, str_mkfs_btrfs); + ADD_ARG (argv, i, "mkfs.btrfs"); /* Optional arguments. */ if (optargs_bitmask & GUESTFS_MKFS_BTRFS_ALLOCSTART_BITMASK) { @@ -290,7 +283,7 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest, int ro, return -1; } - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "snapshot"); @@ -333,7 +326,7 @@ do_btrfs_subvolume_delete (const char *subvo...

...size"); @@ -169,7 +165,7 @@ do_mkfs_btrfs (char *const *devices, return -1; } - ADD_ARG (argv, i, str_mkfs_btrfs); + ADD_ARG (argv, i, "mkfs.btrfs"); /* Optional arguments. */ if (optargs_bitmask & GUESTFS_MKFS_BTRFS_ALLOCSTART_BITMASK) { @@ -290,7 +286,7 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest, int ro, return -1; } - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "snapshot"); @@ -333,7 +329,7 @@ do_btrfs_subvolume_delete (const char *subvo...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’