diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-05 00:26:03 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-05 00:31:32 -0500 |
| commit | 99adc23cf6260a8e5b237f498119ee163d8f71f6 (patch) | |
| tree | 1b1488e62f2b94c0a1a1f8e2c1a5dceba0037612 /libbcachefs/super-io.c | |
| parent | 27c0b6fbc5ffe0979436a6436187d1bf952e9a24 (diff) | |
Update bcachefs sources to 0e765bc37c bcachefs: foreground merging of interior btree nodes
Diffstat (limited to 'libbcachefs/super-io.c')
| -rw-r--r-- | libbcachefs/super-io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/super-io.c b/libbcachefs/super-io.c index 8dce7dc1..e3c319fc 100644 --- a/libbcachefs/super-io.c +++ b/libbcachefs/super-io.c @@ -490,7 +490,7 @@ static const char *read_one_super(struct bch_sb_handle *sb, u64 offset) unsigned order; reread: bio_reset(sb->bio); - sb->bio->bi_bdev = sb->bdev; + bio_set_dev(sb->bio, sb->bdev); sb->bio->bi_iter.bi_sector = offset; sb->bio->bi_iter.bi_size = PAGE_SIZE << sb->page_order; bio_set_op_attrs(sb->bio, REQ_OP_READ, REQ_SYNC|REQ_META); @@ -588,7 +588,7 @@ int bch2_read_super(const char *path, struct bch_opts *opts, * superblocks: */ bio_reset(sb->bio); - sb->bio->bi_bdev = sb->bdev; + bio_set_dev(sb->bio, sb->bdev); sb->bio->bi_iter.bi_sector = BCH_SB_LAYOUT_SECTOR; sb->bio->bi_iter.bi_size = sizeof(struct bch_sb_layout); bio_set_op_attrs(sb->bio, REQ_OP_READ, REQ_SYNC|REQ_META); @@ -667,7 +667,7 @@ static void write_one_super(struct bch_fs *c, struct bch_dev *ca, unsigned idx) null_nonce(), sb); bio_reset(bio); - bio->bi_bdev = ca->disk_sb.bdev; + bio_set_dev(bio, ca->disk_sb.bdev); bio->bi_iter.bi_sector = le64_to_cpu(sb->offset); bio->bi_iter.bi_size = roundup(vstruct_bytes(sb), |