diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-12-21 18:00:30 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-12-21 18:06:45 -0500 |
| commit | 1cf4d51dc4661f336f5318c176a3561ddf5bf04f (patch) | |
| tree | 8b390ccd48361ba1408be6799d46e62c6382cc39 /libbcachefs/chardev.c | |
| parent | 8acc54456e11ee0ec80ed0c6abb6d68abae60592 (diff) | |
Update bcachefs sources to 14ce2a2031 bcachefs: fixes for building in userspace
Diffstat (limited to 'libbcachefs/chardev.c')
| -rw-r--r-- | libbcachefs/chardev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libbcachefs/chardev.c b/libbcachefs/chardev.c index d9a3212c..24af2ca1 100644 --- a/libbcachefs/chardev.c +++ b/libbcachefs/chardev.c @@ -2,6 +2,7 @@ #include "bcachefs.h" #include "bcachefs_ioctl.h" +#include "chardev.h" #include "super.h" #include "super-io.h" @@ -25,7 +26,7 @@ static struct bch_dev *bch2_device_lookup(struct bch_fs *c, u64 dev, return ERR_PTR(-EINVAL); rcu_read_lock(); - ca = c->devs[dev]; + ca = rcu_dereference(c->devs[dev]); if (ca) percpu_ref_get(&ca->ref); rcu_read_unlock(); @@ -80,7 +81,7 @@ static long bch2_ioctl_assemble(struct bch_ioctl_assemble __user *user_arg) devs = kcalloc(arg.nr_devs, sizeof(char *), GFP_KERNEL); - if (copy_from_user(user_devs, arg.devs, + if (copy_from_user(user_devs, user_arg->devs, sizeof(u64) * arg.nr_devs)) goto err; |