From patchwork Thu Mar 27 02:03:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 334168 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DF3D114008D for ; Thu, 27 Mar 2014 12:57:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752114AbaC0B5L (ORCPT ); Wed, 26 Mar 2014 21:57:11 -0400 Received: from mail1.windriver.com ([147.11.146.13]:62060 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751995AbaC0B5K (ORCPT ); Wed, 26 Mar 2014 21:57:10 -0400 Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail1.windriver.com (8.14.5/8.14.5) with ESMTP id s2R1v756014200 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 26 Mar 2014 18:57:08 -0700 (PDT) Received: from pek-blade16.wrs.com (128.224.153.44) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.3.169.1; Wed, 26 Mar 2014 18:57:07 -0700 From: Robert Yang To: CC: , Subject: [PATCH V2] e2fsprogs: misc/mke2fs.c: return error when failed to populate fs Date: Thu, 27 Mar 2014 10:03:07 +0800 Message-ID: <1395885787-25947-1-git-send-email-liezhi.yang@windriver.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org We need return retval when "mke2fs -d" failed, otherwise the "$?" would be 0 which is misleading. Signed-off-by: Robert Yang Reviewed-by: Zheng Liu --- 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")); }