summaryrefslogtreecommitdiff
path: root/utils.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-01-12 11:20:18 +0100
committerDavid Sterba <dsterba@suse.com>2016-01-12 15:02:55 +0100
commit633dc6f80f201afdf5b8524ae377187d58f0ef3b (patch)
treeca5b6375fb6910ac51eea8b89173c45390ce0355 /utils.c
parent374d67fdef869d2e2dfb9907d21c85ee6c19e1d7 (diff)
btrfs-progs: remove unnecessary errno temp variables
We can read errno directly if it's not clobbered by any intermediate calls. Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'utils.c')
-rw-r--r--utils.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/utils.c b/utils.c
index 03648db6..0339894d 100644
--- a/utils.c
+++ b/utils.c
@@ -1516,7 +1516,6 @@ int btrfs_register_one_device(const char *fname)
struct btrfs_ioctl_vol_args args;
int fd;
int ret;
- int e;
fd = open("/dev/btrfs-control", O_RDWR);
if (fd < 0) {
@@ -1528,11 +1527,10 @@ int btrfs_register_one_device(const char *fname)
memset(&args, 0, sizeof(args));
strncpy_null(args.name, fname);
ret = ioctl(fd, BTRFS_IOC_SCAN_DEV, &args);
- e = errno;
if (ret < 0) {
fprintf(stderr, "ERROR: device scan failed '%s' - %s\n",
- fname, strerror(e));
- ret = -e;
+ fname, strerror(errno));
+ ret = -errno;
}
close(fd);
return ret;
@@ -2696,17 +2694,15 @@ int lookup_ino_rootid(int fd, u64 *rootid)
{
struct btrfs_ioctl_ino_lookup_args args;
int ret;
- int e;
memset(&args, 0, sizeof(args));
args.treeid = 0;
args.objectid = BTRFS_FIRST_FREE_OBJECTID;
ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args);
- e = errno;
if (ret) {
fprintf(stderr, "ERROR: Failed to lookup root id - %s\n",
- strerror(e));
+ strerror(errno));
return ret;
}