similar to: [PATCHv2] Added xfs support to vfs_minimum_size.

--- daemon/daemon.h | 1 + daemon/fs-min-size.c | 7 +++++++ daemon/xfs.c | 12 ++++++++++++ generator/actions.ml | 6 +++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 4a969dd..1f0cd30 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -269,6 +269,7 @@ extern int copy_xattrs (const char *src, const char *dest);

Use the proper cleanup handler for deleting the guestfs_int_xfsinfo struct (so the string fields are deleted too). Fixes commit f5caa421d1bb826559ec7a6d98c1a6b6b1f0a629. --- daemon/xfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/xfs.c b/daemon/xfs.c index 7f72e6a..a0d08b2 100644 --- a/daemon/xfs.c +++ b/daemon/xfs.c @@ -664,7 +664,7 @@ do_xfs_repair (const char

--- daemon/btrfs.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ daemon/daemon.h | 1 + daemon/fs-min-size.c | 34 ++++++++++++++++++++++++- generator/actions.ml | 6 ++++- 4 files changed, 110 insertions(+), 2 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ddb029d..652a17e 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2190,3 +2190,74 @@

The btrfs implementation of vfs_minimum_size requires btrfs-progs >= 4.2, erroring with ENOTSUP otherwise; thus mark the btrfs test case of the vfs_minimum_size tests as TestRunOrUnsupported, so it will not cause failures if the available btrfs-progs is not enough. --- generator/actions.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/actions.ml

This call provides the way to get minimum size of filesystem. This is needed for shrinking. The return units are bytes. --- daemon/Makefile.am | 1 + daemon/daemon.h | 1 + daemon/fs-min-size.c | 46 +++++++++++++++++++++++++++ daemon/ntfs.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++ generator/actions.ml | 19 ++++++++++++ po/POTFILES | 1 +

Tried to make it in accordance with your comments. Difference to v1: Added reply_with_error where necessary. Changed name get_min_size -> vfs_min_size. Difference to v2: Changed name to vfs_minimum_size. Changed parsing to xstrtol + STR* macros where possible. Difference to v3: Decapitalize error messages. Maxim Perevedentsev (2): New API: vfs_minimum_size Include resize2fs_P into

On Tue, Oct 20, 2015 at 06:45:54PM +0300, Maxim Perevedentsev wrote: > Tried to make it in accordance with your comments. > > Difference to v1: > Added reply_with_error where necessary. > Changed name get_min_size -> vfs_min_size. > > Difference to v2: > Changed name to vfs_minimum_size. > Changed parsing to xstrtol + STR* macros where possible. > >

On Tuesday 20 October 2015 18:45:55 Maxim Perevedentsev wrote: > +int64_t > +do_vfs_minimum_size (const mountable_t *mountable) > +{ > + int64_t r; > + > + /* How we set the label depends on the filesystem type. */ Just noticed now: this comment should be really fitting more the new function... :) -- Pino Toscano

On 10/20/2015 07:49 PM, Pino Toscano wrote: > On Tuesday 20 October 2015 18:45:55 Maxim Perevedentsev wrote: >> +int64_t >> +do_vfs_minimum_size (const mountable_t *mountable) >> +{ >> + int64_t r; >> + >> + /* How we set the label depends on the filesystem type. */ > Just noticed now: this comment should be really fitting more the new > function...

I have an issue with btrfs: There's an API > btrfs inspect-internal min-dev-size /sysroot/ But this API is available only in btrfs-progs >= 4.2. Before this, there's no reliable way to get minimum size (I could parse "btrfs filesystem show", but it is veeery inaccurate). Can we require btrfs-progs v4.2? Or how should I work-around this issue? -- Your sincerely, Maxim

On 10/20/2015 08:58 PM, Richard W.M. Jones wrote: > On Tue, Oct 20, 2015 at 08:56:25PM +0300, Maxim Perevedentsev wrote: >> I have an issue with btrfs: >> >> There's an API >>> btrfs inspect-internal min-dev-size /sysroot/ >> But this API is available only in btrfs-progs >= 4.2. >> Before this, there's no reliable way to get minimum size (I

Sometimes the user wants to know minimum size for dirty (e.g. mounted) filesystems. In this case, resize2fs -P will require calling e2fsck -f, while "in general, it is not safe to run e2fsck on mounted filesystems". Since resize2fs -P does not modify filesystem, we force it to display (probably approximate) minimum size. --- daemon/ext2.c | 2 +- 1 file changed, 1 insertion(+), 1

On Tue, Oct 20, 2015 at 08:56:25PM +0300, Maxim Perevedentsev wrote: > I have an issue with btrfs: > > There's an API > > btrfs inspect-internal min-dev-size /sysroot/ > > But this API is available only in btrfs-progs >= 4.2. > Before this, there's no reliable way to get minimum size (I could > parse "btrfs filesystem show", but it is veeery

Add the 'label' optional argument to the mkfs action, so it is possible to set a filesystem label direct when creating it. There may be filesystems not supporting changing the label of existing filesystems but only setting it at creation time, so this new optarg will help. Implement it for the most common filesystems (ext*, fat, ntfs, btrfs, xfs), giving an error for all the others, just

This way it is possible to cleanup properly structs in the daemon, when using them within other daemon functions. --- .gitignore | 2 + daemon/Makefile.am | 4 ++ daemon/daemon.h | 1 + generator/daemon.ml | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ generator/daemon.mli | 2 + generator/main.ml | 4 ++ 6 files changed, 114 insertions(+) diff --git

Create a new TestRunOrUnsupported test type, which represents a test sequence where a failure with ENOTSUP in the last command only marks the test as skipped. To be used mainly when testing features available only with some versions of helper tools used in the appliance, for example. --- generator/tests_c_api.ml | 26 ++++++++++++++++++++++++-- generator/types.ml | 5 +++++

Tried to make it in accordance with your comments. Difference to v1: Added reply_with_error where necessary. Changed name get_min_size -> vfs_min_size. Difference to v2: Changed name to vfs_minimum_size. Changed parsing to xstrtol + STR* macros where possible. Maxim Perevedentsev (2): New API: vfs_min_size Include resize2fs_P into vfs_min_size. daemon/Makefile.am | 1 +

--- daemon/btrfs.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ daemon/daemon.h | 1 + daemon/fs-min-size.c | 50 ++++++++++++++++++++++++++++++++++++- generator/actions.ml | 6 ++++- 4 files changed, 124 insertions(+), 2 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index ddb029d..d2d85f3 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2190,3 +2190,72

--- daemon/daemon.h | 1 + daemon/ext2.c | 62 +++++++++++++++++++++++++++++++++++++++++++++------- daemon/fs-min-size.c | 3 +++ generator/actions.ml | 20 ++++------------- src/MAX_PROC_NR | 2 +- 5 files changed, 63 insertions(+), 25 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 3b0266d..8bcc9bd 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@

On Thu, Oct 22, 2015 at 08:05:37PM +0300, Maxim Perevedentsev wrote: > +/* btrfs command add a new command > + * inspect-internal min-dev-size <path> > + * since v4.2 > + * We could check whether 'btrfs' supports > + * 'min-dev-size' command by checking the output of > + * 'btrfs --help' command. > + */ > +static int >