Update bcachefs sources to 7c0fe6f104 bcachefs: Fix bch2_fsck_ask_yn()

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

diff --git a/libbcachefs/chardev.c b/libbcachefs/chardev.c
index e7c8969aaad176c0c2ac33b3fe02edb859081854..670f316029a9fd973bb2092e1a6f70365bbd94c8 100644 (file)
--- a/libbcachefs/chardev.c
+++ b/libbcachefs/chardev.c
@@ -157,6 +157,9 @@ static long bch2_ioctl_query_uuid(struct bch_fs *c,
 #if 0
 static long bch2_ioctl_start(struct bch_fs *c, struct bch_ioctl_start arg)
 {
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if (arg.flags || arg.pad)
                return -EINVAL;
 
@@ -165,6 +168,9 @@ static long bch2_ioctl_start(struct bch_fs *c, struct bch_ioctl_start arg)
 
 static long bch2_ioctl_stop(struct bch_fs *c)
 {
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        bch2_fs_stop(c);
        return 0;
 }
@@ -175,6 +181,9 @@ static long bch2_ioctl_disk_add(struct bch_fs *c, struct bch_ioctl_disk arg)
        char *path;
        int ret;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if (arg.flags || arg.pad)
                return -EINVAL;
 
@@ -192,6 +201,9 @@ static long bch2_ioctl_disk_remove(struct bch_fs *c, struct bch_ioctl_disk arg)
 {
        struct bch_dev *ca;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if ((arg.flags & ~(BCH_FORCE_IF_DATA_LOST|
                           BCH_FORCE_IF_METADATA_LOST|
                           BCH_FORCE_IF_DEGRADED|
@@ -211,6 +223,9 @@ static long bch2_ioctl_disk_online(struct bch_fs *c, struct bch_ioctl_disk arg)
        char *path;
        int ret;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if (arg.flags || arg.pad)
                return -EINVAL;
 
@@ -228,6 +243,9 @@ static long bch2_ioctl_disk_offline(struct bch_fs *c, struct bch_ioctl_disk arg)
        struct bch_dev *ca;
        int ret;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if ((arg.flags & ~(BCH_FORCE_IF_DATA_LOST|
                           BCH_FORCE_IF_METADATA_LOST|
                           BCH_FORCE_IF_DEGRADED|
@@ -250,11 +268,15 @@ static long bch2_ioctl_disk_set_state(struct bch_fs *c,
        struct bch_dev *ca;
        int ret;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if ((arg.flags & ~(BCH_FORCE_IF_DATA_LOST|
                           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);
@@ -262,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;
@@ -331,6 +355,9 @@ static long bch2_ioctl_data(struct bch_fs *c,
        unsigned flags = O_RDONLY|O_CLOEXEC|O_NONBLOCK;
        int ret, fd = -1;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if (arg.op >= BCH_DATA_OP_NR || arg.flags)
                return -EINVAL;
 
@@ -379,7 +406,7 @@ static long bch2_ioctl_fs_usage(struct bch_fs *c,
 {
        struct bch_ioctl_fs_usage *arg = NULL;
        struct bch_replicas_usage *dst_e, *dst_end;
-       struct bch_fs_usage *src;
+       struct bch_fs_usage_online *src;
        u32 replica_entries_bytes;
        unsigned i;
        int ret = 0;
@@ -405,7 +432,7 @@ static long bch2_ioctl_fs_usage(struct bch_fs *c,
        arg->online_reserved    = src->online_reserved;
 
        for (i = 0; i < BCH_REPLICAS_MAX; i++)
-               arg->persistent_reserved[i] = src->persistent_reserved[i];
+               arg->persistent_reserved[i] = src->u.persistent_reserved[i];
 
        dst_e   = arg->replicas;
        dst_end = (void *) arg->replicas + replica_entries_bytes;
@@ -414,12 +441,13 @@ static long bch2_ioctl_fs_usage(struct bch_fs *c,
                struct bch_replicas_entry *src_e =
                        cpu_replicas_entry(&c->replicas, i);
 
-               if (replicas_usage_next(dst_e) > dst_end) {
+               /* check that we have enough space for one replicas entry */
+               if (dst_e + 1 > dst_end) {
                        ret = -ERANGE;
                        break;
                }
 
-               dst_e->sectors          = src->replicas[i];
+               dst_e->sectors          = src->u.replicas[i];
                dst_e->r                = *src_e;
 
                /* recheck after setting nr_devs: */
@@ -475,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          = src.sectors_ec;
+       arg.buckets_ec          = src.buckets_ec;
 
        for (i = 0; i < BCH_DATA_NR; i++) {
-               arg.buckets[i] = src.buckets[i];
-               arg.sectors[i] = src.sectors[i];
+               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);
@@ -496,6 +523,9 @@ static long bch2_ioctl_read_super(struct bch_fs *c,
        struct bch_sb *sb;
        int ret = 0;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if ((arg.flags & ~(BCH_BY_INDEX|BCH_READ_DEV)) ||
            arg.pad)
                return -EINVAL;
@@ -523,7 +553,7 @@ static long bch2_ioctl_read_super(struct bch_fs *c,
        ret = copy_to_user((void __user *)(unsigned long)arg.sb,
                           sb, vstruct_bytes(sb));
 err:
-       if (ca)
+       if (!IS_ERR_OR_NULL(ca))
                percpu_ref_put(&ca->ref);
        mutex_unlock(&c->sb_lock);
        return ret;
@@ -536,13 +566,19 @@ static long bch2_ioctl_disk_get_idx(struct bch_fs *c,
        struct bch_dev *ca;
        unsigned i;
 
+       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,
@@ -551,6 +587,9 @@ static long bch2_ioctl_disk_resize(struct bch_fs *c,
        struct bch_dev *ca;
        int ret;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if ((arg.flags & ~BCH_BY_INDEX) ||
            arg.pad)
                return -EINVAL;
@@ -571,6 +610,9 @@ static long bch2_ioctl_disk_resize_journal(struct bch_fs *c,
        struct bch_dev *ca;
        int ret;
 
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
        if ((arg.flags & ~BCH_BY_INDEX) ||
            arg.pad)
                return -EINVAL;
@@ -591,12 +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)
 {
-       /* ioctls that don't require admin cap: */
+       long ret;
+
        switch (cmd) {
        case BCH_IOCTL_QUERY_UUID:
                return bch2_ioctl_query_uuid(c, arg);
@@ -604,12 +648,6 @@ long bch2_fs_ioctl(struct bch_fs *c, unsigned cmd, void __user *arg)
                return bch2_ioctl_fs_usage(c, arg);
        case BCH_IOCTL_DEV_USAGE:
                return bch2_ioctl_dev_usage(c, arg);
-       }
-
-       if (!capable(CAP_SYS_ADMIN))
-               return -EPERM;
-
-       switch (cmd) {
 #if 0
        case BCH_IOCTL_START:
                BCH_IOCTL(start, struct bch_ioctl_start);
@@ -625,7 +663,6 @@ long bch2_fs_ioctl(struct bch_fs *c, unsigned cmd, void __user *arg)
        if (!test_bit(BCH_FS_STARTED, &c->flags))
                return -EINVAL;
 
-       /* ioctls that do require admin cap: */
        switch (cmd) {
        case BCH_IOCTL_DISK_ADD:
                BCH_IOCTL(disk_add, struct bch_ioctl_disk);
@@ -647,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);