On Mon, Jun 29, 2020 at 04:43:13PM -0700, Chaitanya Kulkarni wrote:

The only difference in block_get_rq and block_bio was the last param
passed  __entry->nr_sector & bio->bi_iter.bi_size respectively. Since
that is not the case anymore replace block_get_rq class with block_bio
for block_getrq and block_sleeprq events, also adjust the code to handle
null bio case in block_bio.

To me it seems like keeping the NULL bio case separate actually is a
little simpler..