diff options
Diffstat (limited to 'fs/bcachefs/alloc_foreground.h')
| -rw-r--r-- | fs/bcachefs/alloc_foreground.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/bcachefs/alloc_foreground.h b/fs/bcachefs/alloc_foreground.h index 90eb8604a0a2..02aef66859c3 100644 --- a/fs/bcachefs/alloc_foreground.h +++ b/fs/bcachefs/alloc_foreground.h @@ -26,12 +26,9 @@ struct dev_alloc_list { }; struct alloc_request { - struct closure *cl; unsigned nr_replicas; unsigned target; - bool ec:1; - bool will_retry_target_devices:1; - bool will_retry_all_devices:1; + bool ec; enum bch_watermark watermark; enum bch_write_flags flags; enum bch_data_type data_type; @@ -213,21 +210,16 @@ static inline bool bch2_bucket_is_open(struct bch_fs *c, unsigned dev, u64 bucke static inline bool bch2_bucket_is_open_safe(struct bch_fs *c, unsigned dev, u64 bucket) { - bool ret; - if (bch2_bucket_is_open(c, dev, bucket)) return true; - spin_lock(&c->freelist_lock); - ret = bch2_bucket_is_open(c, dev, bucket); - spin_unlock(&c->freelist_lock); - - return ret; + guard(spinlock)(&c->freelist_lock); + return bch2_bucket_is_open(c, dev, bucket); } enum bch_write_flags; int bch2_bucket_alloc_set_trans(struct btree_trans *, struct alloc_request *, - struct dev_stripe_state *); + struct dev_stripe_state *, struct closure *); int bch2_alloc_sectors_start_trans(struct btree_trans *, unsigned, unsigned, |