From patchwork Mon Aug 11 09:13:03 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
X-Patchwork-Id: 4706231
Return-Path: <linux-btrfs-owner@kernel.org>
X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
	by patchwork2.web.kernel.org (Postfix) with ESMTP id 48BB9C0338
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Mon, 11 Aug 2014 09:13:16 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
	by mail.kernel.org (Postfix) with ESMTP id 8198320131
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Mon, 11 Aug 2014 09:13:15 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id A233F20122
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Mon, 11 Aug 2014 09:13:14 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752416AbaHKJNL (ORCPT
	<rfc822;patchwork-linux-btrfs@patchwork.kernel.org>);
	Mon, 11 Aug 2014 05:13:11 -0400
Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:38493 "EHLO
	fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751671AbaHKJNL (ORCPT
	<rfc822;linux-btrfs@vger.kernel.org>);
	Mon, 11 Aug 2014 05:13:11 -0400
Received: from kw-mxoi1.gw.nic.fujitsu.com (unknown [10.0.237.133])
	by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id 2446B3EE1D8
	for <linux-btrfs@vger.kernel.org>;
	Mon, 11 Aug 2014 18:13:10 +0900 (JST)
Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92])
	by kw-mxoi1.gw.nic.fujitsu.com (Postfix) with ESMTP id 2C4ADAC046E
	for <linux-btrfs@vger.kernel.org>;
	Mon, 11 Aug 2014 18:13:09 +0900 (JST)
Received: from g01jpfmpwkw03.exch.g01.fujitsu.local
	(g01jpfmpwkw03.exch.g01.fujitsu.local [10.0.193.57])
	by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id D9E141DB802C
	for <linux-btrfs@vger.kernel.org>;
	Mon, 11 Aug 2014 18:13:08 +0900 (JST)
Received: from G01JPEXCHKW14.g01.fujitsu.local
	(G01JPEXCHKW14.g01.fujitsu.local [10.0.194.53])
	by g01jpfmpwkw03.exch.g01.fujitsu.local (Postfix) with ESMTP id
	3181FBD648E for <linux-btrfs@vger.kernel.org>;
	Mon, 11 Aug 2014 18:13:08 +0900 (JST)
X-SecurityPolicyCheck: OK by SHieldMailChecker v2.0.1
X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20120718-4
Message-ID: <53E8891F.3010607@jp.fujitsu.com>
Date: Mon, 11 Aug 2014 18:13:03 +0900
From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
User-Agent: Mozilla/5.0 (Windows NT 6.1;
	rv:24.0) Gecko/20100101 Thunderbird/24.3.0
MIME-Version: 1.0
To: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Subject: [PATCH 3/3] btrfs-progs: Show error message if btrfs filesystem show
	failed to find any btrfs filesystem
X-SecurityPolicyCheck-GC: OK by FENCE-Mail
X-TM-AS-MML: No
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-btrfs.vger.kernel.org>
X-Mailing-List: linux-btrfs@vger.kernel.org
X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI,
	RP_MATCHES_RCVD,
	UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>

Current btrfs doesn't display any error message if this command
failed to find any btrfs filesystem corresponding to
<path>|<uuid>|<device>|<label> which user specified.

Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
---
 cmds-filesystem.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 7633f1f..2f78e24 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -695,6 +695,7 @@ static int cmd_show(int argc, char **argv)
 		ret = btrfs_scan_kernel(search);
 	if (search && !ret) {
 		/* since search is found we are done */
+		found = 1;
 		goto out;
 	}
 
@@ -729,6 +730,15 @@ devs_only:
 		btrfs_close_devices(fs_devices);
 	}
 out:
+	if (search && !found) {
+		fprintf(stderr,
+			"ERROR: Couldn't find any btrfs filesystem "
+			"matches with '%s'.\n", search);
+		fprintf(stderr,
+			"Please check if both '%s' and the range of scanning "
+			"are correct.\n", search);
+	}
+
 	printf("%s\n", BTRFS_BUILD_VERSION);
 	free_seen_fsid();
 	return ret;