libbtrfsutil: fix test assumptions about top-level subvolume

[platform/upstream/btrfs-progs.git] / disk-io.c

diff --git a/disk-io.c b/disk-io.c
index 0b83be7..58eae70 100644 (file)
--- a/disk-io.c
+++ b/disk-io.c
@@ -396,10 +396,12 @@ int read_extent_data(struct btrfs_fs_info *fs_info, char *data, u64 logical,
        }
        device = multi->stripes[0].dev;
 
-       if (device->fd <= 0)
-               goto err;
        if (*len > max_len)
                *len = max_len;
+       if (device->fd < 0) {
+               ret = -EIO;
+               goto err;
+       }
 
        ret = pread64(device->fd, data, *len, multi->stripes[0].physical);
        if (ret != *len)
@@ -1212,7 +1214,7 @@ struct btrfs_fs_info *open_ctree_fs_info(const char *filename,
 
        ret = stat(filename, &st);
        if (ret < 0) {
-               error("cannot stat '%s': %s", filename, strerror(errno));
+               error("cannot stat '%s': %m", filename);
                return NULL;
        }
        if (!(((st.st_mode & S_IFMT) == S_IFREG) || ((st.st_mode & S_IFMT) == S_IFBLK))) {
@@ -1225,7 +1227,7 @@ struct btrfs_fs_info *open_ctree_fs_info(const char *filename,
 
        fp = open(filename, oflags);
        if (fp < 0) {
-               error("cannot open '%s': %s", filename, strerror(errno));
+               error("cannot open '%s': %m", filename);
                return NULL;
        }
        info = __open_ctree_fd(fp, filename, sb_bytenr, root_tree_bytenr,
@@ -1566,8 +1568,7 @@ write_err:
        if (ret > 0)
                fprintf(stderr, "WARNING: failed to write all sb data\n");
        else
-               fprintf(stderr, "WARNING: failed to write sb: %s\n",
-                       strerror(errno));
+               fprintf(stderr, "WARNING: failed to write sb: %m\n");
        return ret;
 }