+/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM block
#endif /* _TRACE_BLOCK_DEF_ */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
-#define lttng_bio_dev(bio) bio_dev(bio)
-#else
-#define lttng_bio_dev(bio) ((bio)->bi_bdev ? (bio)->bi_bdev->bd_dev : 0)
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) || \
+ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,103,92,0,0))
#define lttng_req_op(rq) req_op(rq)
#define lttng_req_rw(rq) ((rq)->cmd_flags)
TP_ARGS(q, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+#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))
#endif
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+#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))
TP_ARGS(q, rq, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+#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))
TP_ARGS(q, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+#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))
TP_ARGS(q, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+ 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,
TP_ARGS(q, bio, rw),
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+#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,
/**
* block_getrq - get a free request entry in queue for block IO operations
* @q: queue for operations
- * @bio: pending block IO operation
+ * @bio: pending block IO operation (can be %NULL)
* @rw: low bit indicates a read (%0) or a write (%1)
*
* A request struct for queue @q has been allocated to handle the
/**
* block_sleeprq - waiting to get a free request entry in queue for block IO operation
* @q: queue for operation
- * @bio: pending block IO operation
+ * @bio: pending block IO operation (can be %NULL)
* @rw: low bit indicates a read (%0) or a write (%1)
*
* In the case where a request struct cannot be provided for queue @q
TP_ARGS(q, bio, new_sector),
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+#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,
TP_ARGS(q, bio, dev, from),
TP_FIELDS(
- ctf_integer(dev_t, dev, lttng_bio_dev(bio))
+#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))