On Thu, Jun 18, 2020 at 06:13:31PM +0200, Jan Kara wrote: > On Wed 17-06-20 23:53:59, Christoph Hellwig wrote: > > On Wed, Jun 17, 2020 at 03:58:23PM +0200, Jan Kara wrote: > > > blk_account_io_merge_request(next); > > > > > > + trace_block_rq_merge(q, next); > > > > q can be derived from next, no need to explicitly pass it. And yes, > > I know a lot of existing tracepoints do so, but I plan to fix that up > > as well. > > I had a look into it now and I could do this but that would mean that > block_rq_merge trace event would now differ from all other similar events > and we couldn't use block_rq event class and have to define our own and so > overall it would IMO make future conversion to get rid of 'q' argument more > difficult, not simpler. So I can do this but are you really sure? Ok, let's keep the original version for now then.