Update bcachefs sources to bed61fae3b bcachefs: Delete a faulty assertion

[bcachefs-tools-debian] / libbcachefs / chardev.c

diff --git a/libbcachefs/chardev.c b/libbcachefs/chardev.c
index 9ac34cc36c07ffeb95e30c3529aa79188c1f0546..fb603df099a5b43d00b6a2bfb783a28403442a97 100644 (file)
--- a/libbcachefs/chardev.c
+++ b/libbcachefs/chardev.c
@@ -275,7 +275,8 @@ static long bch2_ioctl_disk_set_state(struct bch_fs *c,
                           BCH_FORCE_IF_METADATA_LOST|
                           BCH_FORCE_IF_DEGRADED|
                           BCH_BY_INDEX)) ||
-           arg.pad[0] || arg.pad[1] || arg.pad[2])
+           arg.pad[0] || arg.pad[1] || arg.pad[2] ||
+           arg.new_state >= BCH_MEMBER_STATE_NR)
                return -EINVAL;
 
        ca = bch2_device_lookup(c, arg.dev, arg.flags);
@@ -283,6 +284,8 @@ static long bch2_ioctl_disk_set_state(struct bch_fs *c,
                return PTR_ERR(ca);
 
        ret = bch2_dev_set_state(c, ca, arg.new_state, arg.flags);
+       if (ret)
+               bch_err(c, "Error setting device state: %s", bch2_err_str(ret));
 
        percpu_ref_put(&ca->ref);
        return ret;
@@ -500,13 +503,12 @@ static long bch2_ioctl_dev_usage(struct bch_fs *c,
        arg.state               = ca->mi.state;
        arg.bucket_size         = ca->mi.bucket_size;
        arg.nr_buckets          = ca->mi.nbuckets - ca->mi.first_bucket;
-       arg.available_buckets   = arg.nr_buckets - src.buckets_unavailable;
-       arg.ec_buckets          = src.buckets_ec;
-       arg.ec_sectors          = 0;
+       arg.buckets_ec          = src.buckets_ec;
 
        for (i = 0; i < BCH_DATA_NR; i++) {
-               arg.buckets[i] = src.d[i].buckets;
-               arg.sectors[i] = src.d[i].sectors;
+               arg.d[i].buckets        = src.d[i].buckets;
+               arg.d[i].sectors        = src.d[i].sectors;
+               arg.d[i].fragmented     = src.d[i].fragmented;
        }
 
        percpu_ref_put(&ca->ref);
@@ -567,13 +569,16 @@ static long bch2_ioctl_disk_get_idx(struct bch_fs *c,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
+       if (!dev)
+               return -EINVAL;
+
        for_each_online_member(ca, c, i)
-               if (ca->disk_sb.bdev->bd_dev == dev) {
+               if (ca->dev == dev) {
                        percpu_ref_put(&ca->io_ref);
                        return i;
                }
 
-       return -ENOENT;
+       return -BCH_ERR_ENOENT_dev_idx_not_found;
 }
 
 static long bch2_ioctl_disk_resize(struct bch_fs *c,
@@ -628,11 +633,14 @@ do {                                                                      \
                                                                        \
        if (copy_from_user(&i, arg, sizeof(i)))                         \
                return -EFAULT;                                         \
-       return bch2_ioctl_##_name(c, i);                                \
+       ret = bch2_ioctl_##_name(c, i);                                 \
+       goto out;                                                       \
 } while (0)
 
 long bch2_fs_ioctl(struct bch_fs *c, unsigned cmd, void __user *arg)
 {
+       long ret;
+
        switch (cmd) {
        case BCH_IOCTL_QUERY_UUID:
                return bch2_ioctl_query_uuid(c, arg);
@@ -676,6 +684,10 @@ long bch2_fs_ioctl(struct bch_fs *c, unsigned cmd, void __user *arg)
        default:
                return -ENOTTY;
        }
+out:
+       if (ret < 0)
+               ret = bch2_err_class(ret);
+       return ret;
 }
 
 static DEFINE_IDR(bch_chardev_minor);
@@ -741,7 +753,7 @@ int __init bch2_chardev_init(void)
        if (bch_chardev_major < 0)
                return bch_chardev_major;
 
-       bch_chardev_class = class_create(THIS_MODULE, "bcachefs");
+       bch_chardev_class = class_create("bcachefs");
        if (IS_ERR(bch_chardev_class))
                return PTR_ERR(bch_chardev_class);