search for: do_resize2fs_m

...he double free of err. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 2cd3da3..5deff24 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -280,7 +280,6 @@ do_resize2fs_M (const char *device) r = command (NULL, &err, prog, "-M", device, NULL); if (r == -1) { if (strstr (err, "e2fsck -f")) { - free (err); reply_with_error ("you need to run e2fsck with the correct and/or forceall options first"); } else {...

...eall options. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 79fd354..c280ca2 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -277,9 +277,14 @@ do_resize2fs_M (const char *device) if (e2prog (prog) == -1) return -1; - r = command (NULL, &err, prog, "-M" , device, NULL); + r = command (NULL, &err, prog, "-M", device, NULL); if (r == -1) { - reply_with_error ("%s", err); + if (strstr (err, "e2...

...eall options. Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 79fd354..c280ca2 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -277,9 +277,14 @@ do_resize2fs_M (const char *device) if (e2prog (prog) == -1) return -1; - r = command (NULL, &err, prog, "-M" , device, NULL); + r = command (NULL, &err, prog, "-M", device, NULL); if (r == -1) { - reply_with_error ("%s", err); + if (strstr (err, "e2...

...| 35 +++++++++++++++++++++++++++++++++++ generator/actions.ml | 14 ++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index ebaf0f0..0cd6a66 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -279,6 +279,41 @@ do_resize2fs_M (const char *device) return 0; } +int64_t +do_resize2fs_P (const char *device) +{ + CLEANUP_FREE char *err = NULL, *out = NULL; + CLEANUP_FREE_STRING_LIST char **lines = NULL; + int r; + size_t i; + char *p; + int64_t ret; + const char *pattern = "Estimated minimum size of the file...

.... Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- daemon/ext2.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 79fd354..9fe938e 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -277,9 +277,25 @@ do_resize2fs_M (const char *device) if (e2prog (prog) == -1) return -1; - r = command (NULL, &err, prog, "-M" , device, NULL); + r = command (NULL, &err, prog, "-M", device, NULL); if (r == -1) { - reply_with_error ("%s", err); + int i = 0; + int len =...

https://bugzilla.redhat.com/show_bug.cgi?id=755729 This bug reports that the error message printed by the resize2fs API calls (which comes directly from the resize2fs command) says: Please run 'e2fsck -f /dev/vda1' first. That command is not possible from guestfish (where it would be 'e2fsck-f' or 'e2fsck ... forceall:true'). Fixing that bug caused this bug:

...| 35 +++++++++++++++++++++++++++++++++++ generator/actions.ml | 10 ++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index ebaf0f0..3dae40f 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -279,6 +279,41 @@ do_resize2fs_M (const char *device) return 0; } +int64_t +do_resize2fs_P (const char *device) +{ + CLEANUP_FREE char *err = NULL, *out = NULL; + CLEANUP_FREE_STRING_LIST char **lines = NULL; + int r; + size_t i; + char *p; + int64_t ret; + char pattern[] = "Estimated minimum size of the filesyste...

...+ > generator/actions.ml | 10 ++++++++++ > src/MAX_PROC_NR | 2 +- > 3 files changed, 46 insertions(+), 1 deletion(-) > > diff --git a/daemon/ext2.c b/daemon/ext2.c > index ebaf0f0..3dae40f 100644 > --- a/daemon/ext2.c > +++ b/daemon/ext2.c > @@ -279,6 +279,41 @@ do_resize2fs_M (const char *device) > return 0; > } > > +int64_t > +do_resize2fs_P (const char *device) > +{ > + CLEANUP_FREE char *err = NULL, *out = NULL; > + CLEANUP_FREE_STRING_LIST char **lines = NULL; > + int r; > + size_t i; > + char *p; > + int64_t ret; >...

...tdiff;h=4ffa2d6798f7a2bf0baec8e1084659cf6358bc31 Rich. > diff --git a/daemon/ext2.c b/daemon/ext2.c > index 725352e..85ce316 100644 > --- a/daemon/ext2.c > +++ b/daemon/ext2.c > @@ -266,6 +266,27 @@ do_resize2fs_size (const char *device, int64_t size) > } > > int > +do_resize2fs_M (const char *device) > +{ > + char *err; > + int r; > + > + char prog[] = "resize2fs"; > + if (e2prog (prog) == -1) > + return -1; > + > + r = command (NULL, &err, prog, "-M" , device, NULL); > + if (r == -1) { > + reply_with_erro...

...onst char *device); +extern int64_t ext_get_min_size (const char *device); /*-- in blkid.c --*/ extern char *get_blkid_tag (const char *device, const char *tag); diff --git a/daemon/ext2.c b/daemon/ext2.c index 0cd6a66..fcf39de 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -279,8 +279,31 @@ do_resize2fs_M (const char *device) return 0; } +static int32_t +get_block_size (const char *device) +{ + CLEANUP_FREE_STRING_LIST char **params = NULL; + const char *block_pattern = "Block size"; + size_t i; + int32_t block_size; + + params = do_tune2fs_l (device); + if (params == NULL) +...

...m (const char *device); +extern int64_t ext_min_size (const char *device); /*-- in blkid.c --*/ extern char *get_blkid_tag (const char *device, const char *tag); diff --git a/daemon/ext2.c b/daemon/ext2.c index 0cd6a66..f00e081 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -279,8 +279,34 @@ do_resize2fs_M (const char *device) return 0; } +static int32_t +get_block_size (const char *device) +{ + CLEANUP_FREE_STRING_LIST char **params = NULL; + const char *block_pattern = "Block size"; + size_t i; + int32_t block_size; + + params = do_tune2fs_l (device); + if (params == NULL) +...

...--git a/daemon/ext2.c b/daemon/ext2.c index 0cd6a66..01f934b 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -29,6 +29,7 @@ #include "daemon.h" #include "c-ctype.h" #include "actions.h" +#include "xstrtol.h" #define MAX_ARGS 128 @@ -279,15 +280,41 @@ do_resize2fs_M (const char *device) return 0; } +static long +get_block_size (const char *device) +{ + CLEANUP_FREE_STRING_LIST char **params = NULL; + const char *block_pattern = "Block size"; + size_t i; + long block_size; + + params = do_tune2fs_l (device); + if (params == NULL) + retur...

...ext_min_size (const char *device); > > /*-- in blkid.c --*/ > extern char *get_blkid_tag (const char *device, const char *tag); > diff --git a/daemon/ext2.c b/daemon/ext2.c > index 0cd6a66..f00e081 100644 > --- a/daemon/ext2.c > +++ b/daemon/ext2.c > @@ -279,8 +279,34 @@ do_resize2fs_M (const char *device) > return 0; > } > > +static int32_t > +get_block_size (const char *device) > +{ > + CLEANUP_FREE_STRING_LIST char **params = NULL; > + const char *block_pattern = "Block size"; > + size_t i; > + int32_t block_size; > + > +...

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. 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 | 45 ++++++++++++++++++++++++++----- daemon/fs-min-size.c | 49

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 +

Tried to make it in accordance with your comments. Maybe you can suggest a better name for API? Maxim Perevedentsev (2): New API: get_min_size Include resize2fs_P into get_min_size. daemon/Makefile.am | 1 + daemon/daemon.h | 2 ++ daemon/ext2.c | 37 ++++++++++++++++++++++++---- daemon/fs-min-size.c | 49 +++++++++++++++++++++++++++++++++++++ daemon/ntfs.c | 68

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

...sizeof buf, "%" PRIi64 "K", size); - r = command (NULL, &err, "resize2fs", device, buf, NULL); + r = command (NULL, &err, str_resize2fs, device, buf, NULL); if (r == -1) { reply_with_error ("%s", err); free (err); @@ -239,7 +246,7 @@ do_resize2fs_M (const char *device) if (if_not_mounted_run_e2fsck (device) == -1) return -1; - r = command (NULL, &err, "resize2fs", "-M", device, NULL); + r = command (NULL, &err, str_resize2fs, "-M", device, NULL); if (r == -1) { reply_with_error ("...

...snprintf (buf, sizeof buf, "%" PRIi64 "K", size); - r = command (NULL, &err, prog, device, buf, NULL); + r = command (NULL, &err, str_resize2fs, device, buf, NULL); if (r == -1) { reply_with_error ("%s", err); free (err); @@ -282,14 +285,13 @@ do_resize2fs_M (const char *device) char *err; int r; - char prog[] = "resize2fs"; - if (e2prog (prog) == -1) + if (e2prog (str_resize2fs) == -1) return -1; if (if_not_mounted_run_e2fsck (device) == -1) return -1; - r = command (NULL, &err, prog, "-M", device,...

..., sizeof buf, "%" PRIi64 "K", size); - r = command (NULL, &err, str_resize2fs, device, buf, NULL); + r = command (NULL, &err, "resize2fs", device, buf, NULL); if (r == -1) { reply_with_error ("%s", err); return -1; @@ -265,7 +257,7 @@ do_resize2fs_M (const char *device) if (if_not_mounted_run_e2fsck (device) == -1) return -1; - r = command (NULL, &err, str_resize2fs, "-M", device, NULL); + r = command (NULL, &err, "resize2fs", "-M", device, NULL); if (r == -1) { reply_with_error ("...