From patchwork Thu Nov 9 06:59:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 836204 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D3Abi58g"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yXYv21J9Zz9s7M for ; Thu, 9 Nov 2017 17:59:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431AbdKIG7l (ORCPT ); Thu, 9 Nov 2017 01:59:41 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:55733 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbdKIG7k (ORCPT ); Thu, 9 Nov 2017 01:59:40 -0500 Received: by mail-pg0-f65.google.com with SMTP id 207so1183337pgc.12 for ; Wed, 08 Nov 2017 22:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=VMSibzONdXuBVFR0+YmIubY9u8VILDnUs6C3w7WaXiI=; b=D3Abi58gxguXgTdyfjod48/tyZkn2oq/3Btgf4omAjapoQaQSrLsjkj9YTV7XUPB8s 5jnJNMAcCqUtObPTlO+RslNrO6lMMKMuFKv4p0DBaQfUDjZn2XZsmavJy3tmLOeCcBQM PFEsb8z9PSDXGp7hFWjhtjxshpUfHkkDiawiMgWNU7h7jpFzhttnkgI380pcrrr7R2rX JDvi2gzosiEfW6icgE26L08802wh0bFz7Sl7dSVbwfFjyZ3SpgdtreY2vRcFe1tDzLOD nR7Yy+KPcofWEpCVmBuG5h5MPKnTrKme9DVIW2kzSGuhZo+G6xppGpTYGmAVFYvoPNEG hBiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VMSibzONdXuBVFR0+YmIubY9u8VILDnUs6C3w7WaXiI=; b=ALp+vp9sfBmoixyruGFXlsmnPVDqkz+DYviNbzxZjeSXE+JlLBWiJzGkooGUa5C6Wx nzh9s6MRr+mO1mOSNz/b/CFqyuv3q//BFBkEVBlr6beqWzyAhPmx9TkzSrMw4hlmUzdX ooqXZhqauM+J63ifCnKxHukhlh/KFeWD1Vt/lQXNqtDJPS8npIJc2u2QBPKjWCBIzn9T lGlsFXwk1k1Xg0J+e6J8LZxE4BK9BQguU0aYAyExbXYblSWf3Fn7YSMj3AB20dSiIDtj A3lCYf4CBtYIXiBpG1EtZT/zFz10gs//eAVtvxUT/XwgDgAtlJSnl/Hdbv0INAbHn+19 7AKw== X-Gm-Message-State: AJaThX69cF5aLEg3TS0hncC9VZfHy8Myk+v4vKQDhmII+XERL00TbXtq a0iUfnm/+fxW1fd9IJFKbFVvDQ== X-Google-Smtp-Source: ABhQp+TI/CT9a3VfHN9bHBMq73BoOsZuYQ+H5rQy2NOPi3W9jSOgKeS/zu6M3wgA4dxYJsmxmBrWzw== X-Received: by 10.101.83.143 with SMTP id x15mr3011220pgq.150.1510210780227; Wed, 08 Nov 2017 22:59:40 -0800 (PST) Received: from localhost.localdomain (fs276ec80e.tkyc203.ap.nuro.jp. [39.110.200.14]) by smtp.gmail.com with ESMTPSA id r64sm11393109pfg.25.2017.11.08.22.59.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Nov 2017 22:59:39 -0800 (PST) From: Wang Shilong X-Google-Original-From: Wang Shilong To: linux-ext4@vger.kernel.org Cc: qian@ddn.com Subject: [PATCH] debugfs: fix ncheck program output Date: Thu, 9 Nov 2017 15:59:34 +0900 Message-Id: <1510210774-4251-1-git-send-email-wshilong1991@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Qian Yingjin Fix the bug that print the inode number not the program name when reporting bad inode name during checking in ncheck. Minor bug fix: it should reduce iw->inodes_left when found matched inode number. Signed-off-by: Qian Yingjin --- debugfs/ncheck.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debugfs/ncheck.c b/debugfs/ncheck.c index 5d9b5d2..dc4ab56 100644 --- a/debugfs/ncheck.c +++ b/debugfs/ncheck.c @@ -81,6 +81,7 @@ static int ncheck_proc(struct ext2_dir_entry *dirent, } } putc('\n', stdout); + iw->inodes_left--; } } if (!iw->inodes_left) @@ -111,10 +112,8 @@ void do_ncheck(int argc, char **argv) goto print_usage; } } - argc -= optind; - argv += optind; - if (argc < 1) { + if (argc <= 1) { print_usage: com_err(argv[0], 0, "Usage: ncheck [-c] ..."); return; @@ -122,6 +121,8 @@ void do_ncheck(int argc, char **argv) if (check_fs_open(argv[0])) return; + argc -= optind; + argv += optind; iw.iarray = malloc(sizeof(ext2_ino_t) * argc); if (!iw.iarray) { com_err("ncheck", ENOMEM, @@ -133,7 +134,7 @@ void do_ncheck(int argc, char **argv) for (i=0; i < argc; i++) { iw.iarray[i] = strtol(argv[i], &tmp, 0); if (*tmp) { - com_err(argv[0], 0, "Bad inode - %s", argv[i]); + com_err("ncheck", 0, "Bad inode - %s", argv[i]); goto error_out; } }