diff options
-rw-r--r-- | block/blk-core.c | 12 | ||||
-rw-r--r-- | fs/bcachefs/io.c | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index ea33d6abdcfc..8a33463c2035 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -280,6 +280,8 @@ static void req_bio_endio(struct request *rq, struct bio *bio, void blk_dump_rq_flags(struct request *rq, char *msg) { + struct bio *bio; + printk(KERN_INFO "%s: dev %s: flags=%llx\n", msg, rq->rq_disk ? rq->rq_disk->disk_name : "?", (unsigned long long) rq->cmd_flags); @@ -287,8 +289,16 @@ void blk_dump_rq_flags(struct request *rq, char *msg) printk(KERN_INFO " sector %llu, nr/cnr %u/%u\n", (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq), blk_rq_cur_sectors(rq)); - printk(KERN_INFO " bio %p, biotail %p, len %u\n", + printk(KERN_INFO " bio %px, biotail %px, len %u\n", rq->bio, rq->biotail, blk_rq_bytes(rq)); + + printk(KERN_INFO " rq %px\n", rq->end_io); + + __rq_for_each_bio(bio, rq) + printk(KERN_INFO " bio %pf cur %u total %u\n", + bio->bi_end_io, + bio_cur_bytes(bio), + bio->bi_iter.bi_size); } EXPORT_SYMBOL(blk_dump_rq_flags); diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index 1aca92cacdfc..e4369c687a18 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -470,6 +470,12 @@ void bch2_submit_wbio_replicas(struct bch_write_bio *wbio, struct bch_fs *c, if (!journal_flushes_device(ca)) n->bio.bi_opf |= REQ_FUA; + pr_info("submitting %px sector %llu len %u segs %u vecs %u", + &n->bio, + (u64) n->bio.bi_iter.bi_sector, + n->bio.bi_iter.bi_size, bio_segments(&n->bio), + n->bio.bi_vcnt); + if (likely(n->have_ioref)) { this_cpu_add(ca->io_done->sectors[WRITE][type], bio_sectors(&n->bio)); |