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