2014-03-27 01:57:10

by Robert Yang

Subject: [PATCH V2] e2fsprogs: misc/mke2fs.c: return error when failed to populate fs

We need return retval when "mke2fs -d" failed, otherwise the "$?" would
be 0 which is misleading.

Signed-off-by: Robert Yang <[email protected]>
---
misc/mke2fs.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index aecd5d5..60e7466 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -2990,10 +2990,11 @@ no_journal:

retval = populate_fs(fs, EXT2_ROOT_INO, root_dir,
EXT2_ROOT_INO);
- if (retval)
- fprintf(stderr, "%s",
- _("\nError while populating file system"));
- else if (!quiet)
+ if (retval) {
+ com_err(program_name, retval, "%s",
+ _("\nError while populating file system\n"));
+ exit(1);
+ } else if (!quiet)
printf("%s", _("done\n"));
}

--
1.8.3.1

2014-03-30 09:07:51

by Zheng Liu

Subject: Re: [PATCH V2] e2fsprogs: misc/mke2fs.c: return error when failed to populate fs

On Thu, Mar 27, 2014 at 10:03:07AM +0800, Robert Yang wrote:
> We need return retval when "mke2fs -d" failed, otherwise the "$?" would
> be 0 which is misleading.
>
> Signed-off-by: Robert Yang <[email protected]>

Thanks for fixing this.
Reviewed-by: Zheng Liu <[email protected]>

- Zheng

> ---
> misc/mke2fs.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/misc/mke2fs.c b/misc/mke2fs.c
> index aecd5d5..60e7466 100644
> --- a/misc/mke2fs.c
> +++ b/misc/mke2fs.c
> @@ -2990,10 +2990,11 @@ no_journal:
>
> retval = populate_fs(fs, EXT2_ROOT_INO, root_dir,
> EXT2_ROOT_INO);
> - if (retval)
> - fprintf(stderr, "%s",
> - _("\nError while populating file system"));
> - else if (!quiet)
> + if (retval) {
> + com_err(program_name, retval, "%s",
> + _("\nError while populating file system\n"));
> + exit(1);
> + } else if (!quiet)
> printf("%s", _("done\n"));
> }
>
> --
> 1.8.3.1
>

2014-04-14 15:44:19

by Theodore Ts'o

Subject: Re: [PATCH V2] e2fsprogs: misc/mke2fs.c: return error when failed to populate fs

On Sun, Mar 30, 2014 at 05:08:25PM +0800, Zheng Liu wrote:
> On Thu, Mar 27, 2014 at 10:03:07AM +0800, Robert Yang wrote:
> > We need return retval when "mke2fs -d" failed, otherwise the "$?" would
> > be 0 which is misleading.
> >
> > Signed-off-by: Robert Yang <[email protected]>
>
> Thanks for fixing this.
> Reviewed-by: Zheng Liu <[email protected]>

Thanks, applied.

- Ted