diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch | 122 |
1 files changed, 122 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch new file mode 100644 index 0000000000..3644a47d5a --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch | |||
| @@ -0,0 +1,122 @@ | |||
| 1 | Fix errors like | ||
| 2 | |||
| 3 | block.h:344:24: error: 'struct bio' has no member named 'bi_sector' | ||
| 4 | |||
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Index: git/instrumentation/events/lttng-module/block.h | ||
| 9 | =================================================================== | ||
| 10 | --- git.orig/instrumentation/events/lttng-module/block.h 2014-05-02 22:20:01.814125429 -0700 | ||
| 11 | +++ git/instrumentation/events/lttng-module/block.h 2014-05-02 22:28:48.927455709 -0700 | ||
| 12 | @@ -341,9 +341,9 @@ | ||
| 13 | TP_fast_assign( | ||
| 14 | tp_assign(dev, bio->bi_bdev ? | ||
| 15 | bio->bi_bdev->bd_dev : 0) | ||
| 16 | - tp_assign(sector, bio->bi_sector) | ||
| 17 | - tp_assign(nr_sector, bio->bi_size >> 9) | ||
| 18 | - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) | ||
| 19 | + tp_assign(sector, bio->bi_iter.bi_sector) | ||
| 20 | + tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) | ||
| 21 | + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) | ||
| 22 | tp_memcpy(comm, current->comm, TASK_COMM_LEN) | ||
| 23 | ), | ||
| 24 | |||
| 25 | @@ -385,14 +385,14 @@ | ||
| 26 | |||
| 27 | TP_fast_assign( | ||
| 28 | tp_assign(dev, bio->bi_bdev->bd_dev) | ||
| 29 | - tp_assign(sector, bio->bi_sector) | ||
| 30 | - tp_assign(nr_sector, bio->bi_size >> 9) | ||
| 31 | + tp_assign(sector, bio->bi_iter.bi_sector) | ||
| 32 | + tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) | ||
| 33 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) | ||
| 34 | tp_assign(error, error) | ||
| 35 | #else | ||
| 36 | tp_assign(error, 0) | ||
| 37 | #endif | ||
| 38 | - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) | ||
| 39 | + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) | ||
| 40 | ), | ||
| 41 | |||
| 42 | TP_printk("%d,%d %s %llu + %u [%d]", | ||
| 43 | @@ -419,9 +419,9 @@ | ||
| 44 | |||
| 45 | TP_fast_assign( | ||
| 46 | tp_assign(dev, bio->bi_bdev->bd_dev) | ||
| 47 | - tp_assign(sector, bio->bi_sector) | ||
| 48 | - tp_assign(nr_sector, bio->bi_size >> 9) | ||
| 49 | - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) | ||
| 50 | + tp_assign(sector, bio->bi_iter.bi_sector) | ||
| 51 | + tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) | ||
| 52 | + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) | ||
| 53 | tp_memcpy(comm, current->comm, TASK_COMM_LEN) | ||
| 54 | ), | ||
| 55 | |||
| 56 | @@ -485,9 +485,9 @@ | ||
| 57 | |||
| 58 | TP_fast_assign( | ||
| 59 | tp_assign(dev, bio->bi_bdev->bd_dev) | ||
| 60 | - tp_assign(sector, bio->bi_sector) | ||
| 61 | - tp_assign(nr_sector, bio->bi_size >> 9) | ||
| 62 | - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) | ||
| 63 | + tp_assign(sector, bio->bi_iter.bi_sector) | ||
| 64 | + tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) | ||
| 65 | + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) | ||
| 66 | tp_memcpy(comm, current->comm, TASK_COMM_LEN) | ||
| 67 | ), | ||
| 68 | |||
| 69 | @@ -513,9 +513,9 @@ | ||
| 70 | |||
| 71 | TP_fast_assign( | ||
| 72 | tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0) | ||
| 73 | - tp_assign(sector, bio->bi_sector) | ||
| 74 | - tp_assign(nr_sector, bio->bi_size >> 9) | ||
| 75 | - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) | ||
| 76 | + tp_assign(sector, bio->bi_iter.bi_sector) | ||
| 77 | + tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) | ||
| 78 | + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) | ||
| 79 | tp_memcpy(comm, current->comm, TASK_COMM_LEN) | ||
| 80 | ), | ||
| 81 | |||
| 82 | @@ -587,10 +587,10 @@ | ||
| 83 | |||
| 84 | TP_fast_assign( | ||
| 85 | tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0) | ||
| 86 | - tp_assign(sector, bio ? bio->bi_sector : 0) | ||
| 87 | - tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0) | ||
| 88 | + tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0) | ||
| 89 | + tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0) | ||
| 90 | blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0, | ||
| 91 | - bio ? bio->bi_size >> 9 : 0) | ||
| 92 | + bio ? bio->bi_iter.bi_size >> 9 : 0) | ||
| 93 | tp_memcpy(comm, current->comm, TASK_COMM_LEN) | ||
| 94 | ), | ||
| 95 | |||
| 96 | @@ -759,9 +759,9 @@ | ||
| 97 | |||
| 98 | TP_fast_assign( | ||
| 99 | tp_assign(dev, bio->bi_bdev->bd_dev) | ||
| 100 | - tp_assign(sector, bio->bi_sector) | ||
| 101 | + tp_assign(sector, bio->bi_iter.bi_sector) | ||
| 102 | tp_assign(new_sector, new_sector) | ||
| 103 | - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) | ||
| 104 | + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) | ||
| 105 | tp_memcpy(comm, current->comm, TASK_COMM_LEN) | ||
| 106 | ), | ||
| 107 | |||
| 108 | @@ -805,11 +805,11 @@ | ||
| 109 | |||
| 110 | TP_fast_assign( | ||
| 111 | tp_assign(dev, bio->bi_bdev->bd_dev) | ||
| 112 | - tp_assign(sector, bio->bi_sector) | ||
| 113 | - tp_assign(nr_sector, bio->bi_size >> 9) | ||
| 114 | + tp_assign(sector, bio->bi_iter.bi_sector) | ||
| 115 | + tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) | ||
| 116 | tp_assign(old_dev, dev) | ||
| 117 | tp_assign(old_sector, from) | ||
| 118 | - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) | ||
| 119 | + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) | ||
| 120 | ), | ||
| 121 | |||
| 122 | TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", | ||