From: Anand Jain <anand.jain@oracle.com>
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 [thread overview]
Message-ID: <1389698228-9580-1-git-send-email-anand.jain@oracle.com> (raw)
btrfs filesystem show <not-found-label> should return non zero
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
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[] = {
--
1.7.1
next reply other threads:[~2014-01-14 11:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 11:17 Anand Jain [this message]
2014-01-14 11:17 ` [PATCH 2/2] btrfs-progs: mid flight return leaks memory during filesystem show mnt Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389698228-9580-1-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox