search for: do_mkfs_btrf

...daemon/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 +23...

...Hu Tao <hutao@cn.fujitsu.com> --- daemon/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...

...by: Hu Tao <hutao@cn.fujitsu.com> --- daemon/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_ARG...

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

https://bugzilla.redhat.com/show_bug.cgi?id=807905 Currently if you specify the blocksize parameter to mkfs-opts with a btrfs filesystem, then it fails, because mkfs.btrfs interprets the -b option as meaning filesystem size. The first patch fixes this by disallowing blocksize (it cannot be mapped meaningfully into btrfs parameters). The second patch adds the full /sbin/mkfs.btrfs utility to the

...gnostic push > +#pragma GCC diagnostic ignored "-Wstack-usage=10000" > +#endif > + > /* Takes optional arguments, consult optargs_bitmask. */ > int > do_btrfs_filesystem_resize (const char *filesystem, int64_t size) Is this because of the argv[MAX_ARGS] here ^ and in do_mkfs_btrfs? (Similar notes for all the other diagnostic markers added by this patch.) As slightly related change (although that can be done after this patch), something to reduce a bit the stacks in the daemon would be reduce the MAX_ARGS to values closer (but not too much) than the actual needs. I see most...

...ches, count_strings ((void *) matches)); + sort_strings (matches, guestfs_int_count_strings ((void *) matches)); return matches; /* Caller frees. */ } diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ae2310b53..5f1e5d1d0 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -152,7 +152,7 @@ do_mkfs_btrfs (char *const *devices, int leafsize, const char *label, const char *metadata, int nodesize, int sectorsize) { - const size_t nr_devices = count_strings (devices); + const size_t nr_devices = guestfs_int_count_strings (devices); const size_t MAX_ARGS = nr_devic...

...GCC_VERSION >= 40800 /* gcc >= 4.8.0 */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstack-usage=10000" +#endif + /* Takes optional arguments, consult 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...

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

...+51,7 @@ do_btrfs_filesystem_resize (const char *filesystem, int64_t size) size_t i = 0; char size_str[32]; - ADD_ARG (argv, i, "btrfs"); + ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, "filesystem"); ADD_ARG (argv, i, "resize"); @@ -109,7 +114,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...

...+51,7 @@ do_btrfs_filesystem_resize (const char *filesystem, int64_t size) size_t i = 0; char size_str[32]; - ADD_ARG (argv, i, "btrfs"); + ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, "filesystem"); ADD_ARG (argv, i, "resize"); @@ -109,7 +114,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...

...103,7 @@ do_btrfs_filesystem_resize (const char *filesystem, int64_t size) size_t i = 0; char size_str[32]; - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "filesystem"); ADD_ARG (argv, i, "resize"); @@ -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...

...106,7 @@ do_btrfs_filesystem_resize (const char *filesystem, int64_t size) size_t i = 0; char size_str[32]; - ADD_ARG (argv, i, str_btrfs); + ADD_ARG (argv, i, "btrfs"); ADD_ARG (argv, i, "filesystem"); ADD_ARG (argv, i, "resize"); @@ -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...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

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

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

This is a combination of: https://www.redhat.com/archives/libguestfs/2017-June/msg00046.html [PATCH 00/12] Refactor utility functions. plus: https://www.redhat.com/archives/libguestfs/2017-June/msg00023.html [PATCH v3 00/19] Allow APIs to be implemented in OCaml. with the second patches rebased on top of the utility refactoring, and some other adjustments and extensions. This passes

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.