write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/include/trace/events/block.h
..
..
@@ -212,6 +212,21 @@
212
212
 );
213
213
 
214
214
 /**
215
+ * block_rq_merge - merge request with another one in the elevator
216
+ * @q: queue holding operation
217
+ * @rq: block IO operation operation request
218
+ *
219
+ * Called when block operation request @rq from queue @q is merged to another
220
+ * request queued in the elevator.
221
+ */
222
+DEFINE_EVENT(block_rq, block_rq_merge,
223
+
224
+	TP_PROTO(struct request_queue *q, struct request *rq),
225
+
226
+	TP_ARGS(q, rq)
227
+);
228
+
229
+/**
215
230
  * block_bio_bounce - used bounce buffer when processing block operation
216
231
  * @q: queue holding the block operation
217
232
  * @bio: block operation
..
..
@@ -254,16 +269,15 @@
254
269
  * block_bio_complete - completed all work on the block operation
255
270
  * @q: queue holding the block operation
256
271
  * @bio: block operation completed
257
- * @error: io error value
258
272
  *
259
273
  * This tracepoint indicates there is no further work to do on this
260
274
  * block IO operation @bio.
261
275
  */
262
276
 TRACE_EVENT(block_bio_complete,
263
277
 
264
-	TP_PROTO(struct request_queue *q, struct bio *bio, int error),
278
+	TP_PROTO(struct request_queue *q, struct bio *bio),
265
279
 
266
-	TP_ARGS(q, bio, error),
280
+	TP_ARGS(q, bio),
267
281
 
268
282
 	TP_STRUCT__entry(
269
283
 		__field( dev_t,		dev		)
..
..
@@ -277,7 +291,7 @@
277
291
 		__entry->dev		= bio_dev(bio);
278
292
 		__entry->sector		= bio->bi_iter.bi_sector;
279
293
 		__entry->nr_sector	= bio_sectors(bio);
280
-		__entry->error		= error;
294
+		__entry->error		= blk_status_to_errno(bio->bi_status);
281
295
 		blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
282
296
 	),
283
297