diff mbox

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

Message ID 1395885787-25947-1-git-send-email-liezhi.yang@windriver.com
State Accepted, archived
Headers show

Commit Message

Robert Yang March 27, 2014, 2:03 a.m. UTC
We need return retval when "mke2fs -d" failed, otherwise the "$?" would
be 0 which is misleading.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 misc/mke2fs.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Zheng Liu March 30, 2014, 9:08 a.m. UTC | #1
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 <liezhi.yang@windriver.com>

Thanks for fixing this.
Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>

                                                - 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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o April 14, 2014, 3:44 p.m. UTC | #2
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 <liezhi.yang@windriver.com>
> 
> Thanks for fixing this.
> Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>

Thanks, applied.

						- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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"));
 	}