Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: Convert to bch2_dev_tryget_noerror()

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-05-03 17:48:23 -04:00
parent b07eb8252f
commit 4cd91e2f87
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/bcachefs/alloc_foreground.c
View File

@ -717,25 +717,16 @@ int bch2_bucket_alloc_set_trans(struct btree_trans *trans,
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
struct dev_alloc_list devs_sorted = struct dev_alloc_list devs_sorted =
bch2_dev_alloc_list(c, stripe, devs_may_alloc); bch2_dev_alloc_list(c, stripe, devs_may_alloc);
unsigned dev;
struct bch_dev *ca;
int ret = -BCH_ERR_insufficient_devices; int ret = -BCH_ERR_insufficient_devices;
unsigned i;
BUG_ON(*nr_effective >= nr_replicas); BUG_ON(*nr_effective >= nr_replicas);
for (i = 0; i < devs_sorted.nr; i++) { for (unsigned i = 0; i < devs_sorted.nr; i++) {
struct bch_dev_usage usage; struct bch_dev_usage usage;
struct open_bucket *ob; struct open_bucket *ob;
dev = devs_sorted.devs[i]; unsigned dev = devs_sorted.devs[i];
struct bch_dev *ca = bch2_dev_tryget_noerror(c, dev);
rcu_read_lock();
ca = rcu_dereference(c->devs[dev]);
if (ca)
bch2_dev_get(ca);
rcu_read_unlock();
if (!ca) if (!ca)
continue; continue;

7
fs/bcachefs/chardev.c
View File

@ -32,12 +32,7 @@ static struct bch_dev *bch2_device_lookup(struct bch_fs *c, u64 dev,
if (dev >= c->sb.nr_devices) if (dev >= c->sb.nr_devices)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
rcu_read_lock(); ca = bch2_dev_tryget_noerror(c, dev);
ca = rcu_dereference(c->devs[dev]);
if (ca)
bch2_dev_get(ca);
rcu_read_unlock();
if (!ca) if (!ca)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} else { } else {