Update bcachefs sources to fad6d13aa5 fixup! bcachefs: Add persistent counters

[bcachefs-tools-debian] / include / linux / bio.h

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 7736198febc5a49e8b06ac041c43050d5c5277fb..7d596df6c47ee7df3afeaf7ed446cf2209ea5fbe 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -113,8 +113,17 @@ static inline void *bio_data(struct bio *bio)
 
 #define __bio_kunmap_atomic(addr)      kunmap_atomic(addr)
 
-#define bio_for_each_segment_all(bvl, bio, i)                          \
-       for (i = 0, bvl = (bio)->bi_io_vec; i < (bio)->bi_vcnt; i++, bvl++)
+static inline struct bio_vec *bio_next_segment(const struct bio *bio,
+                                              struct bvec_iter_all *iter)
+{
+       if (iter->idx >= bio->bi_vcnt)
+               return NULL;
+
+       return &bio->bi_io_vec[iter->idx];
+}
+
+#define bio_for_each_segment_all(bvl, bio, iter) \
+       for ((iter).idx = 0; (bvl = bio_next_segment((bio), &(iter))); (iter).idx++)
 
 static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
                                    unsigned bytes)
@@ -136,6 +145,9 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
 #define bio_for_each_segment(bvl, bio, iter)                           \
        __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
 
+#define __bio_for_each_bvec(bvl, bio, iter, start)                     \
+       __bio_for_each_segment(bvl, bio, iter, start)
+
 #define bio_iter_last(bvec, iter) ((iter).bi_size == (bvec).bv_len)
 
 static inline unsigned bio_segments(struct bio *bio)
@@ -200,23 +212,19 @@ static inline struct bio *bio_next_split(struct bio *bio, int sectors,
 
 struct bio_set {
        unsigned int front_pad;
+       unsigned int back_pad;
+       mempool_t bio_pool;
+       mempool_t bvec_pool;
 };
 
-static inline void bioset_exit(struct bio_set *bs) {}
 
 static inline void bioset_free(struct bio_set *bs)
 {
        kfree(bs);
 }
 
-static inline int bioset_init(struct bio_set *bs,
-                             unsigned pool_size,
-                             unsigned front_pad,
-                             int flags)
-{
-       bs->front_pad = front_pad;
-       return 0;
-}
+void bioset_exit(struct bio_set *);
+int bioset_init(struct bio_set *, unsigned, unsigned, int);
 
 extern struct bio_set *bioset_create(unsigned int, unsigned int);
 extern struct bio_set *bioset_create_nobvec(unsigned int, unsigned int);
@@ -225,29 +233,22 @@ enum {
        BIOSET_NEED_RESCUER     = 1 << 1,
 };
 
-extern struct bio *bio_alloc_bioset(gfp_t, int, struct bio_set *);
+struct bio *bio_alloc_bioset(struct block_device *, unsigned,
+                            unsigned, gfp_t, struct bio_set *);
 extern void bio_put(struct bio *);
 
-extern void __bio_clone_fast(struct bio *, struct bio *);
-extern struct bio *bio_clone_fast(struct bio *, gfp_t, struct bio_set *);
-extern struct bio *bio_clone_bioset(struct bio *, gfp_t, struct bio_set *bs);
-
-static inline struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned int nr_iovecs)
-{
-       return bio_alloc_bioset(gfp_mask, nr_iovecs, NULL);
-}
+int bio_add_page(struct bio *, struct page *, unsigned, unsigned);
 
-static inline struct bio *bio_clone_kmalloc(struct bio *bio, gfp_t gfp_mask)
-{
-       return bio_clone_bioset(bio, gfp_mask, NULL);
+struct bio *bio_alloc_clone(struct block_device *, struct bio *,
+                           gfp_t, struct bio_set *);
 
-}
+struct bio *bio_kmalloc(gfp_t, unsigned int);
 
 extern void bio_endio(struct bio *);
 
 extern void bio_advance(struct bio *, unsigned);
 
-extern void bio_reset(struct bio *);
+extern void bio_reset(struct bio *, struct block_device *, unsigned);
 void bio_chain(struct bio *, struct bio *);
 
 extern void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter,
@@ -414,20 +415,15 @@ static inline void bio_inc_remaining(struct bio *bio)
        atomic_inc(&bio->__bi_remaining);
 }
 
-static inline struct bio *bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs)
-{
-       return bio_alloc_bioset(gfp_mask, nr_iovecs, NULL);
-}
-
-static inline struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask)
-{
-       return bio_clone_bioset(bio, gfp_mask, NULL);
-}
-
-static inline void bio_init(struct bio *bio, struct bio_vec *table,
-             unsigned short max_vecs)
+static inline void bio_init(struct bio *bio,
+                           struct block_device *bdev,
+                           struct bio_vec *table,
+                           unsigned short max_vecs,
+                           unsigned int opf)
 {
        memset(bio, 0, sizeof(*bio));
+       bio->bi_bdev = bdev;
+       bio->bi_opf = opf;
        atomic_set(&bio->__bi_remaining, 1);
        atomic_set(&bio->__bi_cnt, 1);