From patchwork Tue Jan 14 11:17:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 3485271 Return-Path: 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 2F919C02DC for ; Tue, 14 Jan 2014 11:08:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33C3F201F7 for ; Tue, 14 Jan 2014 11:08:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E9B9201E9 for ; Tue, 14 Jan 2014 11:07:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751353AbaANLH4 (ORCPT ); Tue, 14 Jan 2014 06:07:56 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:36824 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbaANLHz (ORCPT ); Tue, 14 Jan 2014 06:07:55 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s0EB7sxQ021075 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 14 Jan 2014 11:07:54 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by ucsinet22.oracle.com (8.14.5+Sun/8.14.5) with ESMTP id s0EB7rq3019473 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 14 Jan 2014 11:07:54 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s0EB7rLF020656 for ; Tue, 14 Jan 2014 11:07:53 GMT Received: from wish.sg.oracle.com (/10.186.101.18) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 14 Jan 2014 03:07:52 -0800 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/2] btrfs-progs: return non zero when label is not found Date: Tue, 14 Jan 2014 19:17:07 +0800 Message-Id: <1389698228-9580-1-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.7.1 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.0 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 btrfs filesystem show should return non zero Signed-off-by: Anand Jain --- cmds-filesystem.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index c50a65f..ee6cc84 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -612,6 +612,7 @@ static int cmd_show(int argc, char **argv) char path[PATH_MAX]; __u8 fsid[BTRFS_FSID_SIZE]; char uuid_buf[37]; + int found = 0; while (1) { int long_index; @@ -694,8 +695,10 @@ static int cmd_show(int argc, char **argv) ret = btrfs_scan_kernel_v2(search); if (ret == -ENOTTY) ret = btrfs_scan_kernel(search); - if (search && !ret) - return 0; + if (search && !ret) { + /* since search is found we are done */ + goto out; + } /* shows mounted only */ if (where == BTRFS_SCAN_MOUNTED) @@ -717,12 +720,15 @@ devs_only: continue; print_one_uuid(fs_devices); + found = 1; } + if (search && !found) + ret = 1; out: printf("%s\n", BTRFS_BUILD_VERSION); free_seen_fsid(); - return 0; + return ret; } static const char * const cmd_sync_usage[] = {