search for: vfs_minimum_size

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 deletio...

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. > > Difference to v3: > Decapitalize error messages. > > Maxim Perevedentsev (2): > New API: vfs_minimum_size > Include resize2fs_P into vfs_minimum_size. > > daemon/Makefile.am | 1 + > daemon/d...

...m_size (const char *path); /*-- debug-bmap.c --*/ extern char *debug_bmap (const char *subcmd, size_t argc, char *const *const argv); diff --git a/daemon/fs-min-size.c b/daemon/fs-min-size.c index ca71c4d..ba0f739 100644 --- a/daemon/fs-min-size.c +++ b/daemon/fs-min-size.c @@ -73,6 +73,13 @@ do_vfs_minimum_size (const mountable_t *mountable) r = btrfs_minimum_size (path); } + else if (STREQ (vfs_type, "xfs")) { + CLEANUP_FREE char *path = get_mount_point (mountable->device); + if (path == NULL) + return -1; + r = xfs_minimum_size (path); + } + else NOT_SUPPORT...

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 vfs_minimum_size. daemon/Makefile.am | 1 + daemon/daemon.h | 2 ++ daemon/ext2.c | 62 +++++++...

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 +++++

...2) { + if (STREQ (mountpoints[i], device)) { + path = strdup (mountpoints[i + 1]); + if (path == NULL) + reply_with_perror ("strdup"); + return path; + } + } + + reply_with_error ("device not mounted: %s", device); + return NULL; +} + int64_t do_vfs_minimum_size (const mountable_t *mountable) { int64_t r; - /* How we set the label depends on the filesystem type. */ + /* How we get minimum size depends on the filesystem type. */ CLEANUP_FREE char *vfs_type = do_vfs_type (mountable); if (vfs_type == NULL) return -1; @@ -41,6 +66,13 @@ do_vf...

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... :) Thanks. I'll fix it in final submission, after Richar...

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

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

...to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +#include "daemon.h" +#include "actions.h" + +int64_t +do_vfs_minimum_size (const mountable_t *mountable) +{ + int64_t r; + + /* How we set the label depends on the filesystem type. */ + CLEANUP_FREE char *vfs_type = do_vfs_type (mountable); + if (vfs_type == NULL) + return -1; + + else if (STREQ (vfs_type, "ntfs")) + r = ntfs_minimum_size (mountable-...

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

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/daemon.h | 2 ++ daemon/ext2.c | 62 ++++++++++++++++++++++++++++++++----- daemon/fs-min-size.c | 4...

...} } +#undef XSTRTOD64 + + reply_with_error ("Minimum size not found. Check output format:\n%s", out); return -1; } diff --git a/daemon/fs-min-size.c b/daemon/fs-min-size.c index 652eb0e..4f93f8c 100644 --- a/daemon/fs-min-size.c +++ b/daemon/fs-min-size.c @@ -35,6 +35,9 @@ do_vfs_minimum_size (const mountable_t *mountable) if (vfs_type == NULL) return -1; + else if (fstype_is_extfs (vfs_type)) + r = ext_minimum_size (mountable->device); + else if (STREQ (vfs_type, "ntfs")) r = ntfs_minimum_size (mountable->device); diff --git a/generator/actions.ml...

...if (stat1.st_rdev == stat2.st_rdev) { + /* found it */ + path = strdup (m->mnt_dir); + endmntent (fp); + return path; + } + } + } + + endmntent (fp); + reply_with_error ("device not mounted: %s", device); + return NULL; +} + int64_t do_vfs_minimum_size (const mountable_t *mountable) { int64_t r; - /* How we set the label depends on the filesystem type. */ + /* How we get minimum size depends on the filesystem type. */ CLEANUP_FREE char *vfs_type = do_vfs_type (mountable); if (vfs_type == NULL) return -1; @@ -41,6 +82,13 @@ do_vf...

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/daemon.h | 2 ++ daemon/ext2.c | 62 ++++++++++++++++++++++++++++++++----- daemon/fs-min-size.c | 4...

...m_size (const char *path); /*-- debug-bmap.c --*/ extern char *debug_bmap (const char *subcmd, size_t argc, char *const *const argv); diff --git a/daemon/fs-min-size.c b/daemon/fs-min-size.c index e43237b..432e04f 100644 --- a/daemon/fs-min-size.c +++ b/daemon/fs-min-size.c @@ -64,6 +64,13 @@ do_vfs_minimum_size (const mountable_t *mountable) r = btrfs_minimum_size (path); } + else if (STREQ (vfs_type, "xfs")) { + CLEANUP_FREE char *path = get_mount_point (mountable->device); + if (path == NULL) + return -1; + r = xfs_minimum_size (path); + } + else NOT_SUPPORT...

...+ path = strdup (m->mnt_dir); > + endmntent (fp); > + return path; > + } > + } > + } > + > + endmntent (fp); > + reply_with_error ("device not mounted: %s", device); > + return NULL; > +} > + > int64_t > do_vfs_minimum_size (const mountable_t *mountable) > { > int64_t r; > > - /* How we set the label depends on the filesystem type. */ > + /* How we get minimum size depends on the filesystem type. */ > CLEANUP_FREE char *vfs_type = do_vfs_type (mountable); > if (vfs_type == NULL) >...