@@ -312,9 +312,7 @@ void bch_write_bdev_super(struct cached_dev *dc, struct closure *parent)
closure_init(cl, parent);
bio_init(bio, dc->sb_bv, 1);
- bio_set_dev(bio, dc->bdev);
- bio->bi_end_io = write_bdev_super_endio;
- bio->bi_private = dc;
+ bio_init_fields(bio, dc->bdev, 0, dc, write_bdev_super_endio, 0, 0);
closure_get(cl);
/* I/O request sent to backing device */
@@ -356,9 +354,7 @@ void bcache_write_super(struct cache_set *c)
ca->sb.version = version;
bio_init(bio, ca->sb_bv, 1);
- bio_set_dev(bio, ca->bdev);
- bio->bi_end_io = write_super_endio;
- bio->bi_private = ca;
+ bio_init_fields(bio, ca->bdev, 0, ca, write_super_endio, 0, 0);
closure_get(cl);
__write_super(&ca->sb, ca->sb_disk, bio);
@@ -402,9 +398,7 @@ static void uuid_io(struct cache_set *c, int op, unsigned long op_flags,
bio->bi_opf = REQ_SYNC | REQ_META | op_flags;
bio->bi_iter.bi_size = KEY_SIZE(k) << 9;
-
- bio->bi_end_io = uuid_endio;
- bio->bi_private = cl;
+ bio_init_fields(bio, NULL, 0, cl, uuid_endio, 0, 0);
bio_set_op_attrs(bio, op, REQ_SYNC|REQ_META|op_flags);
bch_bio_map(bio, c->uuids);
@@ -566,12 +560,9 @@ static void prio_io(struct cache *ca, uint64_t bucket, int op,
closure_init_stack(cl);
- bio->bi_iter.bi_sector = bucket * ca->sb.bucket_size;
- bio_set_dev(bio, ca->bdev);
bio->bi_iter.bi_size = meta_bucket_bytes(&ca->sb);
-
- bio->bi_end_io = prio_endio;
- bio->bi_private = ca;
+ bio_init_fields(bio, ca->bdev, bucket * ca->sb.bucket_size, ca,
+ prio_endio, 0, 0);
bio_set_op_attrs(bio, op, REQ_SYNC|REQ_META|op_flags);
bch_bio_map(bio, ca->disk_buckets);
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> --- drivers/md/bcache/super.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)