Commit dac56212e8127dbc0bff7be35c508bc280213309 titled "bio: skip atomic inc/dec of ->bi_cnt for most use cases" made __bi_cnt dependent on the new BIO_REFFED flag.
bio_reset() does not reset __bi_cnt, but it does reset the BIO_REFFED flag. But __bi_cnt depends now on the BIO_REFFED flag, so bio_reset() needs to preserve this flag. Signed-off-by: Alex Lyakas <[email protected]> --- block/bio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/bio.c b/block/bio.c index b64cedc..96f8dca 100644 --- a/block/bio.c +++ b/block/bio.c @@ -301,11 +301,17 @@ void bio_init(struct bio *bio, struct bio_vec *table, void bio_reset(struct bio *bio) { unsigned long flags = bio->bi_flags & (~0UL << BIO_RESET_BITS); + bool bio_reffed = bio_flagged(bio, BIO_REFFED); bio_uninit(bio); memset(bio, 0, BIO_RESET_BYTES); bio->bi_flags = flags; + + /* we are not resetting __bi_cnt, but it depends on correct BIO_REFFED */ + if (bio_reffed) + bio_set_flag(bio, BIO_REFFED); + atomic_set(&bio->__bi_remaining, 1); } EXPORT_SYMBOL(bio_reset); -- 1.9.1
