From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2] btrfs-progs: reserve < 0 return value for errnos
Date: Fri, 27 Oct 2017 22:41:18 +0800 [thread overview]
Message-ID: <20171027144118.23449-1-anand.jain@oracle.com> (raw)
In-Reply-To: <20171027073133.24874-1-anand.jain@oracle.com>
btrfs_read_dev_super() returns -1 / -EPERM upon not finding a suitable SB,
change that to return -ENOENT instead, which is much closer to the actual
possible errors.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: use -ENOENT instead of 1.
disk-io.c | 2 +-
utils.c | 2 +-
volumes.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/disk-io.c b/disk-io.c
index f5edc4796619..dcaaea898a3f 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1491,7 +1491,7 @@ int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr,
}
}
- return transid > 0 ? 0 : -1;
+ return transid > 0 ? 0 : -ENOENT;
}
static int write_dev_supers(struct btrfs_fs_info *fs_info,
diff --git a/utils.c b/utils.c
index 524f463d3140..7574cda8151c 100644
--- a/utils.c
+++ b/utils.c
@@ -1678,7 +1678,7 @@ int get_fs_info(const char *path, struct btrfs_ioctl_fs_info_args *fi_args,
disk_super = (struct btrfs_super_block *)buf;
ret = btrfs_read_dev_super(fd, disk_super,
BTRFS_SUPER_INFO_OFFSET, 0);
- if (ret < 0) {
+ if (ret) {
ret = -EIO;
goto out;
}
diff --git a/volumes.c b/volumes.c
index 2209e5a9100b..87008bfdd586 100644
--- a/volumes.c
+++ b/volumes.c
@@ -268,7 +268,7 @@ int btrfs_scan_one_device(int fd, const char *path,
disk_super = (struct btrfs_super_block *)buf;
ret = btrfs_read_dev_super(fd, disk_super, super_offset, sbflags);
- if (ret < 0)
+ if (ret)
return -EIO;
devid = btrfs_stack_device_id(&disk_super->dev_item);
if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_METADUMP)
--
2.13.1
prev parent reply other threads:[~2017-10-27 14:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 7:31 [PATCH] btrfs-progs: reserve < 0 return value for errnos Anand Jain
2017-10-27 7:54 ` Nikolay Borisov
2017-10-27 8:04 ` Qu Wenruo
2017-10-27 14:41 ` Anand Jain
2017-10-27 14:41 ` Anand Jain [this message]
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=20171027144118.23449-1-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;
as well as URLs for NNTP newsgroup(s).