| Message ID | 20210202052544.4108-2-chaitanya.kulkarni@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | blktrace: few clenaup | expand |
On 2021/02/02 14:26, Chaitanya Kulkarni wrote: > The last parameter for the function blk_fill_rwbs() was added in > 5782138e47 ("tracing/events: convert block trace points to > TRACE_EVENT()") in order to signal read request and use of that parameter > was replaced with using switch case REQ_OP_READ with > 1b9a9ab78b0 ("blktrace: use op accessors"), but the parameter was never > removed. > > Remove the unused parameter and adjust the respective call sites. > > Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> > --- > include/linux/blktrace_api.h | 2 +- > include/trace/events/bcache.h | 10 +++++----- > include/trace/events/block.h | 16 ++++++++-------- > kernel/trace/blktrace.c | 2 +- > 4 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h > index 05556573b896..11484f1d19a1 100644 > --- a/include/linux/blktrace_api.h > +++ b/include/linux/blktrace_api.h > @@ -119,7 +119,7 @@ struct compat_blk_user_trace_setup { > > #endif > > -extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes); > +extern void blk_fill_rwbs(char *rwbs, unsigned int op); > > static inline sector_t blk_rq_trace_sector(struct request *rq) > { > diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h > index e41c611d6d3b..899fdacf57b9 100644 > --- a/include/trace/events/bcache.h > +++ b/include/trace/events/bcache.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(bcache_request, > __entry->sector = bio->bi_iter.bi_sector; > __entry->orig_sector = bio->bi_iter.bi_sector - 16; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u (from %d,%d @ %llu)", > @@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(bcache_bio, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u", > @@ -137,7 +137,7 @@ TRACE_EVENT(bcache_read, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > __entry->cache_hit = hit; > __entry->bypass = bypass; > ), > @@ -168,7 +168,7 @@ TRACE_EVENT(bcache_write, > __entry->inode = inode; > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > __entry->writeback = writeback; > __entry->bypass = bypass; > ), > @@ -238,7 +238,7 @@ TRACE_EVENT(bcache_journal_write, > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > __entry->nr_keys = keys; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u keys %u", > diff --git a/include/trace/events/block.h b/include/trace/events/block.h > index 0d782663a005..879cba8bdfca 100644 > --- a/include/trace/events/block.h > +++ b/include/trace/events/block.h > @@ -89,7 +89,7 @@ TRACE_EVENT(block_rq_requeue, > __entry->sector = blk_rq_trace_sector(rq); > __entry->nr_sector = blk_rq_trace_nr_sectors(rq); > > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > __get_str(cmd)[0] = '\0'; > ), > > @@ -133,7 +133,7 @@ TRACE_EVENT(block_rq_complete, > __entry->nr_sector = nr_bytes >> 9; > __entry->error = error; > > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > __get_str(cmd)[0] = '\0'; > ), > > @@ -166,7 +166,7 @@ DECLARE_EVENT_CLASS(block_rq, > __entry->nr_sector = blk_rq_trace_nr_sectors(rq); > __entry->bytes = blk_rq_bytes(rq); > > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > __get_str(cmd)[0] = '\0'; > memcpy(__entry->comm, current->comm, TASK_COMM_LEN); > ), > @@ -249,7 +249,7 @@ TRACE_EVENT(block_bio_complete, > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio_sectors(bio); > __entry->error = blk_status_to_errno(bio->bi_status); > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u [%d]", > @@ -276,7 +276,7 @@ DECLARE_EVENT_CLASS(block_bio, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio_sectors(bio); > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > memcpy(__entry->comm, current->comm, TASK_COMM_LEN); > ), > > @@ -433,7 +433,7 @@ TRACE_EVENT(block_split, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->new_sector = new_sector; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > memcpy(__entry->comm, current->comm, TASK_COMM_LEN); > ), > > @@ -474,7 +474,7 @@ TRACE_EVENT(block_bio_remap, > __entry->nr_sector = bio_sectors(bio); > __entry->old_dev = dev; > __entry->old_sector = from; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", > @@ -518,7 +518,7 @@ TRACE_EVENT(block_rq_remap, > __entry->old_dev = dev; > __entry->old_sector = from; > __entry->nr_bios = blk_rq_count_bios(rq); > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > ), > > TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u", > diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c > index 9e9ee4945043..8a2591c7aa41 100644 > --- a/kernel/trace/blktrace.c > +++ b/kernel/trace/blktrace.c > @@ -1867,7 +1867,7 @@ void blk_trace_remove_sysfs(struct device *dev) > > #ifdef CONFIG_EVENT_TRACING > > -void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes) > +void blk_fill_rwbs(char *rwbs, unsigned int op) > { > int i = 0; > > Looks good. Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
On 2021/02/02 14:26, Chaitanya Kulkarni wrote: > The last parameter for the function blk_fill_rwbs() was added in > 5782138e47 ("tracing/events: convert block trace points to > TRACE_EVENT()") in order to signal read request and use of that parameter > was replaced with using switch case REQ_OP_READ with > 1b9a9ab78b0 ("blktrace: use op accessors"), but the parameter was never > removed. > > Remove the unused parameter and adjust the respective call sites. > > Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Fixes tag ? > --- > include/linux/blktrace_api.h | 2 +- > include/trace/events/bcache.h | 10 +++++----- > include/trace/events/block.h | 16 ++++++++-------- > kernel/trace/blktrace.c | 2 +- > 4 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h > index 05556573b896..11484f1d19a1 100644 > --- a/include/linux/blktrace_api.h > +++ b/include/linux/blktrace_api.h > @@ -119,7 +119,7 @@ struct compat_blk_user_trace_setup { > > #endif > > -extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes); > +extern void blk_fill_rwbs(char *rwbs, unsigned int op); > > static inline sector_t blk_rq_trace_sector(struct request *rq) > { > diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h > index e41c611d6d3b..899fdacf57b9 100644 > --- a/include/trace/events/bcache.h > +++ b/include/trace/events/bcache.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(bcache_request, > __entry->sector = bio->bi_iter.bi_sector; > __entry->orig_sector = bio->bi_iter.bi_sector - 16; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u (from %d,%d @ %llu)", > @@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(bcache_bio, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u", > @@ -137,7 +137,7 @@ TRACE_EVENT(bcache_read, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > __entry->cache_hit = hit; > __entry->bypass = bypass; > ), > @@ -168,7 +168,7 @@ TRACE_EVENT(bcache_write, > __entry->inode = inode; > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > __entry->writeback = writeback; > __entry->bypass = bypass; > ), > @@ -238,7 +238,7 @@ TRACE_EVENT(bcache_journal_write, > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio->bi_iter.bi_size >> 9; > __entry->nr_keys = keys; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u keys %u", > diff --git a/include/trace/events/block.h b/include/trace/events/block.h > index 0d782663a005..879cba8bdfca 100644 > --- a/include/trace/events/block.h > +++ b/include/trace/events/block.h > @@ -89,7 +89,7 @@ TRACE_EVENT(block_rq_requeue, > __entry->sector = blk_rq_trace_sector(rq); > __entry->nr_sector = blk_rq_trace_nr_sectors(rq); > > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > __get_str(cmd)[0] = '\0'; > ), > > @@ -133,7 +133,7 @@ TRACE_EVENT(block_rq_complete, > __entry->nr_sector = nr_bytes >> 9; > __entry->error = error; > > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > __get_str(cmd)[0] = '\0'; > ), > > @@ -166,7 +166,7 @@ DECLARE_EVENT_CLASS(block_rq, > __entry->nr_sector = blk_rq_trace_nr_sectors(rq); > __entry->bytes = blk_rq_bytes(rq); > > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > __get_str(cmd)[0] = '\0'; > memcpy(__entry->comm, current->comm, TASK_COMM_LEN); > ), > @@ -249,7 +249,7 @@ TRACE_EVENT(block_bio_complete, > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio_sectors(bio); > __entry->error = blk_status_to_errno(bio->bi_status); > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u [%d]", > @@ -276,7 +276,7 @@ DECLARE_EVENT_CLASS(block_bio, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->nr_sector = bio_sectors(bio); > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > memcpy(__entry->comm, current->comm, TASK_COMM_LEN); > ), > > @@ -433,7 +433,7 @@ TRACE_EVENT(block_split, > __entry->dev = bio_dev(bio); > __entry->sector = bio->bi_iter.bi_sector; > __entry->new_sector = new_sector; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > memcpy(__entry->comm, current->comm, TASK_COMM_LEN); > ), > > @@ -474,7 +474,7 @@ TRACE_EVENT(block_bio_remap, > __entry->nr_sector = bio_sectors(bio); > __entry->old_dev = dev; > __entry->old_sector = from; > - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); > + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); > ), > > TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", > @@ -518,7 +518,7 @@ TRACE_EVENT(block_rq_remap, > __entry->old_dev = dev; > __entry->old_sector = from; > __entry->nr_bios = blk_rq_count_bios(rq); > - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); > + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); > ), > > TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u", > diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c > index 9e9ee4945043..8a2591c7aa41 100644 > --- a/kernel/trace/blktrace.c > +++ b/kernel/trace/blktrace.c > @@ -1867,7 +1867,7 @@ void blk_trace_remove_sysfs(struct device *dev) > > #ifdef CONFIG_EVENT_TRACING > > -void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes) > +void blk_fill_rwbs(char *rwbs, unsigned int op) > { > int i = 0; > >
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 05556573b896..11484f1d19a1 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -119,7 +119,7 @@ struct compat_blk_user_trace_setup { #endif -extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes); +extern void blk_fill_rwbs(char *rwbs, unsigned int op); static inline sector_t blk_rq_trace_sector(struct request *rq) { diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h index e41c611d6d3b..899fdacf57b9 100644 --- a/include/trace/events/bcache.h +++ b/include/trace/events/bcache.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(bcache_request, __entry->sector = bio->bi_iter.bi_sector; __entry->orig_sector = bio->bi_iter.bi_sector - 16; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u (from %d,%d @ %llu)", @@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(bcache_bio, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u", @@ -137,7 +137,7 @@ TRACE_EVENT(bcache_read, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); __entry->cache_hit = hit; __entry->bypass = bypass; ), @@ -168,7 +168,7 @@ TRACE_EVENT(bcache_write, __entry->inode = inode; __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); __entry->writeback = writeback; __entry->bypass = bypass; ), @@ -238,7 +238,7 @@ TRACE_EVENT(bcache_journal_write, __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; __entry->nr_keys = keys; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u keys %u", diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 0d782663a005..879cba8bdfca 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -89,7 +89,7 @@ TRACE_EVENT(block_rq_requeue, __entry->sector = blk_rq_trace_sector(rq); __entry->nr_sector = blk_rq_trace_nr_sectors(rq); - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); __get_str(cmd)[0] = '\0'; ), @@ -133,7 +133,7 @@ TRACE_EVENT(block_rq_complete, __entry->nr_sector = nr_bytes >> 9; __entry->error = error; - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); __get_str(cmd)[0] = '\0'; ), @@ -166,7 +166,7 @@ DECLARE_EVENT_CLASS(block_rq, __entry->nr_sector = blk_rq_trace_nr_sectors(rq); __entry->bytes = blk_rq_bytes(rq); - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); __get_str(cmd)[0] = '\0'; memcpy(__entry->comm, current->comm, TASK_COMM_LEN); ), @@ -249,7 +249,7 @@ TRACE_EVENT(block_bio_complete, __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio_sectors(bio); __entry->error = blk_status_to_errno(bio->bi_status); - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u [%d]", @@ -276,7 +276,7 @@ DECLARE_EVENT_CLASS(block_bio, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio_sectors(bio); - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); memcpy(__entry->comm, current->comm, TASK_COMM_LEN); ), @@ -433,7 +433,7 @@ TRACE_EVENT(block_split, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->new_sector = new_sector; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); memcpy(__entry->comm, current->comm, TASK_COMM_LEN); ), @@ -474,7 +474,7 @@ TRACE_EVENT(block_bio_remap, __entry->nr_sector = bio_sectors(bio); __entry->old_dev = dev; __entry->old_sector = from; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", @@ -518,7 +518,7 @@ TRACE_EVENT(block_rq_remap, __entry->old_dev = dev; __entry->old_sector = from; __entry->nr_bios = blk_rq_count_bios(rq); - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); ), TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u", diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 9e9ee4945043..8a2591c7aa41 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1867,7 +1867,7 @@ void blk_trace_remove_sysfs(struct device *dev) #ifdef CONFIG_EVENT_TRACING -void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes) +void blk_fill_rwbs(char *rwbs, unsigned int op) { int i = 0;
The last parameter for the function blk_fill_rwbs() was added in 5782138e47 ("tracing/events: convert block trace points to TRACE_EVENT()") in order to signal read request and use of that parameter was replaced with using switch case REQ_OP_READ with 1b9a9ab78b0 ("blktrace: use op accessors"), but the parameter was never removed. Remove the unused parameter and adjust the respective call sites. Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> --- include/linux/blktrace_api.h | 2 +- include/trace/events/bcache.h | 10 +++++----- include/trace/events/block.h | 16 ++++++++-------- kernel/trace/blktrace.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-)