instrumentation: block: remove compatibility code
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 13 Apr 2020 19:51:53 +0000 (15:51 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 13 Apr 2020 19:59:35 +0000 (15:59 -0400)
instrumentation/events/lttng-module/block.h

index d98febe2509e4a928421f852d399fa996c457306..3ca513693d2408ed5e58b0a580c957fae9cad140 100644 (file)
@@ -9,11 +9,8 @@
 #include <linux/blktrace_api.h>
 #include <linux/blkdev.h>
 #include <linux/trace_seq.h>
-#include <linux/version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
 #include <scsi/scsi_request.h>
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
 
 #ifndef _TRACE_BLOCK_DEF_
 #define _TRACE_BLOCK_DEF_
@@ -50,15 +47,6 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type,
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) || \
-       LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
-       LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
-       LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-       LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,103,7,0,0) || \
-       LTTNG_SLE_KERNEL_RANGE(4,4,114,94,0,0, 4,4,114,95,0,0) || \
-       LTTNG_SLE_KERNEL_RANGE(4,4,120,94,0,0, 4,4,120,95,0,0) || \
-       LTTNG_SLE_KERNEL_RANGE(4,4,126,94,0,0, 4,5,0,0,0,0))
-
 #define lttng_req_op(rq)       req_op(rq)
 #define lttng_req_rw(rq)       ((rq)->cmd_flags)
 #define lttng_bio_op(bio)      bio_op(bio)
@@ -78,45 +66,6 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type,
                        | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0)      \
                        | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
-
-#define lttng_req_op(rq)
-#define lttng_req_rw(rq)       ((rq)->cmd_flags)
-#define lttng_bio_op(bio)
-#define lttng_bio_rw(bio)      ((bio)->bi_rw)
-
-#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes)                              \
-               ctf_enum(block_rq_type, type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \
-                       ( (rw) & REQ_DISCARD ? RWBS_FLAG_DISCARD :            \
-                       ( (bytes) ? RWBS_FLAG_READ :                          \
-                       ( 0 ))))                                              \
-                       | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0)          \
-                       | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0)              \
-                       | ((rw) & REQ_META ? RWBS_FLAG_META : 0)              \
-                       | ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0)          \
-                       | ((rw) & REQ_FLUSH ? RWBS_FLAG_FLUSH : 0)            \
-                       | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
-
-#else
-
-#define lttng_req_op(rq)
-#define lttng_req_rw(rq)       ((rq)->cmd_flags)
-#define lttng_bio_op(bio)
-#define lttng_bio_rw(bio)      ((bio)->bi_rw)
-
-#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes)                              \
-               ctf_enum(block_rq_type, type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE :     \
-                       ( (rw) & REQ_DISCARD ? RWBS_FLAG_DISCARD :            \
-                       ( (bytes) ? RWBS_FLAG_READ :                          \
-                       ( 0 ))))                                              \
-                       | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0)          \
-                       | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0)              \
-                       | ((rw) & REQ_META ? RWBS_FLAG_META : 0)              \
-                       | ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0))
-
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(block_buffer,
 
        TP_PROTO(struct buffer_head *bh),
@@ -155,116 +104,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_buffer, block_dirty_buffer,
 
        TP_ARGS(bh)
 )
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
-/* block_rq_with_error event class removed in kernel 4.12 */
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
-LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
-
-       TP_PROTO(struct request_queue *q, struct request *rq),
-
-       TP_ARGS(q, rq),
-
-       TP_locvar(
-               sector_t sector;
-               unsigned int nr_sector;
-               unsigned char *cmd;
-               size_t cmd_len;
-       ),
-
-       TP_code_pre(
-               if (blk_rq_is_scsi(rq)) {
-                       struct scsi_request *scsi_rq = scsi_req(rq);
-                       tp_locvar->sector = 0;
-                       tp_locvar->nr_sector = 0;
-                       tp_locvar->cmd = scsi_rq->cmd;
-                       tp_locvar->cmd_len = scsi_rq->cmd_len;
-               } else {
-                       tp_locvar->sector = blk_rq_pos(rq);
-                       tp_locvar->nr_sector = blk_rq_sectors(rq);
-                       tp_locvar->cmd = NULL;
-                       tp_locvar->cmd_len = 0;
-               }
-       ),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev,
-                       rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
-               ctf_integer(sector_t, sector, tp_locvar->sector)
-               ctf_integer(unsigned int, nr_sector, tp_locvar->nr_sector)
-               ctf_integer(int, errors, rq->errors)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
-               ctf_sequence_hex(unsigned char, cmd,
-                       tp_locvar->cmd, size_t, tp_locvar->cmd_len)
-       ),
-
-       TP_code_post()
-)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
-LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
-
-       TP_PROTO(struct request_queue *q, struct request *rq),
-
-       TP_ARGS(q, rq),
-
-       TP_locvar(
-               sector_t sector;
-               unsigned int nr_sector;
-               unsigned char *cmd;
-               size_t cmd_len;
-       ),
-
-       TP_code_pre(
-
-               if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
-                       tp_locvar->sector = 0;
-                       tp_locvar->nr_sector = 0;
-                       tp_locvar->cmd = rq->cmd;
-                       tp_locvar->cmd_len = rq->cmd_len;
-               } else {
-                       tp_locvar->sector = blk_rq_pos(rq);
-                       tp_locvar->nr_sector = blk_rq_sectors(rq);
-                       tp_locvar->cmd = NULL;
-                       tp_locvar->cmd_len = 0;
-               }
-       ),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev,
-                       rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
-               ctf_integer(sector_t, sector, tp_locvar->sector)
-               ctf_integer(unsigned int, nr_sector, tp_locvar->nr_sector)
-               ctf_integer(int, errors, rq->errors)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
-               ctf_sequence_hex(unsigned char, cmd,
-                       tp_locvar->cmd, size_t, tp_locvar->cmd_len)
-       ),
-
-       TP_code_post()
-)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
-/**
- * block_rq_abort - abort block operation request
- * @q: queue containing the block operation request
- * @rq: block IO operation request
- *
- * Called immediately after pending block IO operation request @rq in
- * queue @q is aborted. The fields in the operation request @rq
- * can be examined to determine which device and sectors the pending
- * operation would access.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_abort,
-
-       TP_PROTO(struct request_queue *q, struct request *rq),
-
-       TP_ARGS(q, rq)
-)
-#endif
 
 /**
  * block_rq_requeue - place block IO request back on a queue
@@ -275,7 +114,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_abort,
  * @q.  For some reason the request was not completed and needs to be
  * put back in the queue.
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
 LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
 
        TP_PROTO(struct request_queue *q, struct request *rq),
@@ -291,14 +129,6 @@ LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
                        lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
        )
 )
-#else
-LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_requeue,
-
-       TP_PROTO(struct request_queue *q, struct request *rq),
-
-       TP_ARGS(q, rq)
-)
-#endif
 
 /**
  * block_rq_complete - block IO operation completed by device driver
@@ -312,7 +142,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_requeue,
  * do for the request. If @rq->bio is non-NULL then there is
  * additional work required to complete the request.
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
 LTTNG_TRACEPOINT_EVENT(block_rq_complete,
 
        TP_PROTO(struct request *rq, int error, unsigned int nr_bytes),
@@ -329,112 +158,7 @@ LTTNG_TRACEPOINT_EVENT(block_rq_complete,
                        lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
        )
 )
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
-LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
-
-       TP_PROTO(struct request_queue *q, struct request *rq,
-                unsigned int nr_bytes),
-
-       TP_ARGS(q, rq, nr_bytes),
-
-       TP_locvar(
-               unsigned char *cmd;
-               size_t cmd_len;
-       ),
-
-       TP_code_pre(
-               if (blk_rq_is_scsi(rq)) {
-                       struct scsi_request *scsi_rq = scsi_req(rq);
-                       tp_locvar->cmd = scsi_rq->cmd;
-                       tp_locvar->cmd_len = scsi_rq->cmd_len;
-               } else {
-                       tp_locvar->cmd = NULL;
-                       tp_locvar->cmd_len = 0;
-               }
-       ),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev,
-                       rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
-               ctf_integer(sector_t, sector, blk_rq_pos(rq))
-               ctf_integer(unsigned int, nr_sector, nr_bytes >> 9)
-               ctf_integer(int, errors, rq->errors)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
-               ctf_sequence_hex(unsigned char, cmd,
-                       tp_locvar->cmd, size_t, tp_locvar->cmd_len)
-       ),
-
-       TP_code_post()
-)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,5)    \
-       || LTTNG_KERNEL_RANGE(3,12,21, 3,13,0)          \
-       || LTTNG_KERNEL_RANGE(3,10,41, 3,11,0)          \
-       || LTTNG_KERNEL_RANGE(3,4,91, 3,5,0)            \
-       || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0)            \
-       || LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,28, 3,14,0,0)      \
-       || LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,0,0, 3,11,0,0,0,0))
-
-LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
-
-       TP_PROTO(struct request_queue *q, struct request *rq,
-                unsigned int nr_bytes),
-
-       TP_ARGS(q, rq, nr_bytes),
-
-       TP_locvar(
-               unsigned char *cmd;
-               size_t cmd_len;
-       ),
-
-       TP_code_pre(
-               if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
-                       tp_locvar->cmd = rq->cmd;
-                       tp_locvar->cmd_len = rq->cmd_len;
-               } else {
-                       tp_locvar->cmd = NULL;
-                       tp_locvar->cmd_len = 0;
-               }
-       ),
 
-       TP_FIELDS(
-               ctf_integer(dev_t, dev,
-                       rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
-               ctf_integer(sector_t, sector, blk_rq_pos(rq))
-               ctf_integer(unsigned int, nr_sector, nr_bytes >> 9)
-               ctf_integer(int, errors, rq->errors)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
-               ctf_sequence_hex(unsigned char, cmd,
-                       tp_locvar->cmd, size_t, tp_locvar->cmd_len)
-       ),
-
-       TP_code_post()
-)
-
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
-
-/**
- * block_rq_complete - block IO operation completed by device driver
- * @q: queue containing the block operation request
- * @rq: block operations request
- *
- * The block_rq_complete tracepoint event indicates that some portion
- * of operation request has been completed by the device driver.  If
- * the @rq->bio is %NULL, then there is absolutely no additional work to
- * do for the request. If @rq->bio is non-NULL then there is
- * additional work required to complete the request.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_complete,
-
-       TP_PROTO(struct request_queue *q, struct request *rq),
-
-       TP_ARGS(q, rq)
-)
-
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
 
        TP_PROTO(struct request_queue *q, struct request *rq),
@@ -453,102 +177,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
                ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
        )
 )
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
-LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
-
-       TP_PROTO(struct request_queue *q, struct request *rq),
-
-       TP_ARGS(q, rq),
-
-       TP_locvar(
-               sector_t sector;
-               unsigned int nr_sector;
-               unsigned int bytes;
-               unsigned char *cmd;
-               size_t cmd_len;
-       ),
-
-       TP_code_pre(
-               if (blk_rq_is_scsi(rq)) {
-                       struct scsi_request *scsi_rq = scsi_req(rq);
-                       tp_locvar->sector = 0;
-                       tp_locvar->nr_sector = 0;
-                       tp_locvar->bytes = scsi_rq->resid_len;
-                       tp_locvar->cmd = scsi_rq->cmd;
-                       tp_locvar->cmd_len = scsi_rq->cmd_len;
-               } else {
-                       tp_locvar->sector = blk_rq_pos(rq);
-                       tp_locvar->nr_sector = blk_rq_sectors(rq);
-                       tp_locvar->bytes = 0;
-                       tp_locvar->cmd = NULL;
-                       tp_locvar->cmd_len = 0;
-               }
-       ),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev,
-                       rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
-               ctf_integer(sector_t, sector, tp_locvar->sector)
-               ctf_integer(unsigned int, nr_sector, tp_locvar->nr_sector)
-               ctf_integer(unsigned int, bytes, tp_locvar->bytes)
-               ctf_integer(pid_t, tid, current->pid)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
-               ctf_sequence_hex(unsigned char, cmd,
-                       tp_locvar->cmd, size_t, tp_locvar->cmd_len)
-               ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
-       ),
-
-       TP_code_post()
-)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
-LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
-
-       TP_PROTO(struct request_queue *q, struct request *rq),
-
-       TP_ARGS(q, rq),
-
-       TP_locvar(
-               sector_t sector;
-               unsigned int nr_sector;
-               unsigned int bytes;
-               unsigned char *cmd;
-               size_t cmd_len;
-       ),
-
-       TP_code_pre(
-               if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
-                       tp_locvar->sector = 0;
-                       tp_locvar->nr_sector = 0;
-                       tp_locvar->bytes = blk_rq_bytes(rq);
-                       tp_locvar->cmd = rq->cmd;
-                       tp_locvar->cmd_len = rq->cmd_len;
-               } else {
-                       tp_locvar->sector = blk_rq_pos(rq);
-                       tp_locvar->nr_sector = blk_rq_sectors(rq);
-                       tp_locvar->bytes = 0;
-                       tp_locvar->cmd = NULL;
-                       tp_locvar->cmd_len = 0;
-               }
-       ),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev,
-                       rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
-               ctf_integer(sector_t, sector, tp_locvar->sector)
-               ctf_integer(unsigned int, nr_sector, tp_locvar->nr_sector)
-               ctf_integer(unsigned int, bytes, tp_locvar->bytes)
-               ctf_integer(pid_t, tid, current->pid)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
-               ctf_sequence_hex(unsigned char, cmd,
-                       tp_locvar->cmd, size_t, tp_locvar->cmd_len)
-               ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
-       ),
-
-       TP_code_post()
-)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
 
 /**
  * block_rq_insert - insert block operation request into queue
@@ -600,24 +228,12 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
        TP_ARGS(q, bio),
 
        TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
                ctf_integer(dev_t, dev, bio_dev(bio))
-#else
-               ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
                ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
                ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
                blk_rwbs_ctf_integer(unsigned int, rwbs,
                        lttng_bio_op(bio), lttng_bio_rw(bio),
                        bio->bi_iter.bi_size)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(sector_t, sector, bio->bi_sector)
-               ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_bio_op(bio), lttng_bio_rw(bio),
-                       bio->bi_size)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
                ctf_integer(pid_t, tid, current->pid)
                ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
        )
@@ -639,29 +255,16 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complete,
        TP_ARGS(q, bio, error),
 
        TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
                ctf_integer(dev_t, dev, bio_dev(bio))
-#else
-               ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
                ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
                ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
                ctf_integer(int, error, error)
                blk_rwbs_ctf_integer(unsigned int, rwbs,
                        lttng_bio_op(bio), lttng_bio_rw(bio),
                        bio->bi_iter.bi_size)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(sector_t, sector, bio->bi_sector)
-               ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
-               ctf_integer(int, error, error)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
 
        TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
@@ -669,23 +272,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
        TP_ARGS(q, rq, bio),
 
        TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
                ctf_integer(dev_t, dev, bio_dev(bio))
-#else
-               ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
                ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
                ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
                blk_rwbs_ctf_integer(unsigned int, rwbs,
                        lttng_bio_op(bio), lttng_bio_rw(bio),
                        bio->bi_iter.bi_size)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(sector_t, sector, bio->bi_sector)
-               ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
                ctf_integer(pid_t, tid, current->pid)
                ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
        )
@@ -735,90 +327,17 @@ LTTNG_TRACEPOINT_EVENT(block_bio_queue,
        TP_ARGS(q, bio),
 
        TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
                ctf_integer(dev_t, dev, bio_dev(bio))
-#else
-               ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
                ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
                ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
                blk_rwbs_ctf_integer(unsigned int, rwbs,
                        lttng_bio_op(bio), lttng_bio_rw(bio),
                        bio->bi_iter.bi_size)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(sector_t, sector, bio->bi_sector)
-               ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(pid_t, tid, current->pid)
-               ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
-       )
-)
-#else /* if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) */
-LTTNG_TRACEPOINT_EVENT_CLASS(block_bio,
-
-       TP_PROTO(struct request_queue *q, struct bio *bio),
-
-       TP_ARGS(q, bio),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
-               ctf_integer(sector_t, sector, bio->bi_sector)
-               ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
                ctf_integer(pid_t, tid, current->pid)
                ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
        )
 )
 
-/**
- * block_bio_backmerge - merging block operation to the end of an existing operation
- * @q: queue holding operation
- * @bio: new block operation to merge
- *
- * Merging block request @bio to the end of an existing block request
- * in queue @q.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_backmerge,
-
-       TP_PROTO(struct request_queue *q, struct bio *bio),
-
-       TP_ARGS(q, bio)
-)
-
-/**
- * block_bio_frontmerge - merging block operation to the beginning of an existing operation
- * @q: queue holding operation
- * @bio: new block operation to merge
- *
- * Merging block IO operation @bio to the beginning of an existing block
- * operation in queue @q.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_frontmerge,
-
-       TP_PROTO(struct request_queue *q, struct bio *bio),
-
-       TP_ARGS(q, bio)
-)
-
-/**
- * block_bio_queue - putting new block IO operation in queue
- * @q: queue holding operation
- * @bio: new block operation
- *
- * About to place the block IO operation @bio into queue @q.
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_queue,
-
-       TP_PROTO(struct request_queue *q, struct bio *bio),
-
-       TP_ARGS(q, bio)
-)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) */
-
 LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
 
        TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
@@ -826,12 +345,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
        TP_ARGS(q, bio, rw),
 
        TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
                ctf_integer(dev_t, dev, bio ? bio_dev(bio) : 0)
-#else
-               ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
                ctf_integer(sector_t, sector, bio ? bio->bi_iter.bi_sector : 0)
                ctf_integer(unsigned int, nr_sector,
                        bio ? bio_sectors(bio) : 0)
@@ -839,15 +353,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
                        bio ? lttng_bio_op(bio) : 0,
                        bio ? lttng_bio_rw(bio) : 0,
                        bio ? bio->bi_iter.bi_size : 0)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(sector_t, sector, bio ? bio->bi_sector : 0)
-               ctf_integer(unsigned int, nr_sector,
-                       bio ? bio->bi_size >> 9 : 0)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       bio ? lttng_bio_op(bio) : 0,
-                       bio ? lttng_bio_rw(bio) : 0,
-                       bio ? bio->bi_size : 0)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
                ctf_integer(pid_t, tid, current->pid)
                ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
         )
@@ -955,21 +460,11 @@ LTTNG_TRACEPOINT_EVENT(block_split,
        TP_ARGS(q, bio, new_sector),
 
        TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
                ctf_integer(dev_t, dev, bio_dev(bio))
-#else
-               ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
                ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
                blk_rwbs_ctf_integer(unsigned int, rwbs,
                        lttng_bio_op(bio), lttng_bio_rw(bio),
                        bio->bi_iter.bi_size)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(sector_t, sector, bio->bi_sector)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
                ctf_integer(sector_t, new_sector, new_sector)
                ctf_integer(pid_t, tid, current->pid)
                ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
@@ -994,23 +489,12 @@ LTTNG_TRACEPOINT_EVENT(block_bio_remap,
        TP_ARGS(q, bio, dev, from),
 
        TP_FIELDS(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
                ctf_integer(dev_t, dev, bio_dev(bio))
-#else
-               ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
                ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
                ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
                blk_rwbs_ctf_integer(unsigned int, rwbs,
                        lttng_bio_op(bio), lttng_bio_rw(bio),
                        bio->bi_iter.bi_size)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
-               ctf_integer(sector_t, sector, bio->bi_sector)
-               ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
-               blk_rwbs_ctf_integer(unsigned int, rwbs,
-                       lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
                ctf_integer(dev_t, old_dev, dev)
                ctf_integer(sector_t, old_sector, from)
        )
This page took 0.032558 seconds and 4 git commands to generate.