.. | .. |
---|
40 | 40 | TP_STRUCT__entry( |
---|
41 | 41 | __field( dev_t, dev ) |
---|
42 | 42 | __field( char, sync_commit ) |
---|
43 | | - __field( int, transaction ) |
---|
| 43 | + __field( tid_t, transaction ) |
---|
44 | 44 | ), |
---|
45 | 45 | |
---|
46 | 46 | TP_fast_assign( |
---|
.. | .. |
---|
49 | 49 | __entry->transaction = commit_transaction->t_tid; |
---|
50 | 50 | ), |
---|
51 | 51 | |
---|
52 | | - TP_printk("dev %d,%d transaction %d sync %d", |
---|
| 52 | + TP_printk("dev %d,%d transaction %u sync %d", |
---|
53 | 53 | MAJOR(__entry->dev), MINOR(__entry->dev), |
---|
54 | 54 | __entry->transaction, __entry->sync_commit) |
---|
55 | 55 | ); |
---|
.. | .. |
---|
97 | 97 | TP_STRUCT__entry( |
---|
98 | 98 | __field( dev_t, dev ) |
---|
99 | 99 | __field( char, sync_commit ) |
---|
100 | | - __field( int, transaction ) |
---|
101 | | - __field( int, head ) |
---|
| 100 | + __field( tid_t, transaction ) |
---|
| 101 | + __field( tid_t, head ) |
---|
102 | 102 | ), |
---|
103 | 103 | |
---|
104 | 104 | TP_fast_assign( |
---|
.. | .. |
---|
108 | 108 | __entry->head = journal->j_tail_sequence; |
---|
109 | 109 | ), |
---|
110 | 110 | |
---|
111 | | - TP_printk("dev %d,%d transaction %d sync %d head %d", |
---|
| 111 | + TP_printk("dev %d,%d transaction %u sync %d head %u", |
---|
112 | 112 | MAJOR(__entry->dev), MINOR(__entry->dev), |
---|
113 | 113 | __entry->transaction, __entry->sync_commit, __entry->head) |
---|
114 | 114 | ); |
---|
.. | .. |
---|
134 | 134 | ); |
---|
135 | 135 | |
---|
136 | 136 | DECLARE_EVENT_CLASS(jbd2_handle_start_class, |
---|
137 | | - TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, |
---|
| 137 | + TP_PROTO(dev_t dev, tid_t tid, unsigned int type, |
---|
138 | 138 | unsigned int line_no, int requested_blocks), |
---|
139 | 139 | |
---|
140 | 140 | TP_ARGS(dev, tid, type, line_no, requested_blocks), |
---|
141 | 141 | |
---|
142 | 142 | TP_STRUCT__entry( |
---|
143 | 143 | __field( dev_t, dev ) |
---|
144 | | - __field( unsigned long, tid ) |
---|
| 144 | + __field( tid_t, tid ) |
---|
145 | 145 | __field( unsigned int, type ) |
---|
146 | 146 | __field( unsigned int, line_no ) |
---|
147 | 147 | __field( int, requested_blocks) |
---|
.. | .. |
---|
155 | 155 | __entry->requested_blocks = requested_blocks; |
---|
156 | 156 | ), |
---|
157 | 157 | |
---|
158 | | - TP_printk("dev %d,%d tid %lu type %u line_no %u " |
---|
| 158 | + TP_printk("dev %d,%d tid %u type %u line_no %u " |
---|
159 | 159 | "requested_blocks %d", |
---|
160 | 160 | MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, |
---|
161 | 161 | __entry->type, __entry->line_no, __entry->requested_blocks) |
---|
162 | 162 | ); |
---|
163 | 163 | |
---|
164 | 164 | DEFINE_EVENT(jbd2_handle_start_class, jbd2_handle_start, |
---|
165 | | - TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, |
---|
| 165 | + TP_PROTO(dev_t dev, tid_t tid, unsigned int type, |
---|
166 | 166 | unsigned int line_no, int requested_blocks), |
---|
167 | 167 | |
---|
168 | 168 | TP_ARGS(dev, tid, type, line_no, requested_blocks) |
---|
169 | 169 | ); |
---|
170 | 170 | |
---|
171 | 171 | DEFINE_EVENT(jbd2_handle_start_class, jbd2_handle_restart, |
---|
172 | | - TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, |
---|
| 172 | + TP_PROTO(dev_t dev, tid_t tid, unsigned int type, |
---|
173 | 173 | unsigned int line_no, int requested_blocks), |
---|
174 | 174 | |
---|
175 | 175 | TP_ARGS(dev, tid, type, line_no, requested_blocks) |
---|
176 | 176 | ); |
---|
177 | 177 | |
---|
178 | 178 | TRACE_EVENT(jbd2_handle_extend, |
---|
179 | | - TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, |
---|
| 179 | + TP_PROTO(dev_t dev, tid_t tid, unsigned int type, |
---|
180 | 180 | unsigned int line_no, int buffer_credits, |
---|
181 | 181 | int requested_blocks), |
---|
182 | 182 | |
---|
.. | .. |
---|
184 | 184 | |
---|
185 | 185 | TP_STRUCT__entry( |
---|
186 | 186 | __field( dev_t, dev ) |
---|
187 | | - __field( unsigned long, tid ) |
---|
| 187 | + __field( tid_t, tid ) |
---|
188 | 188 | __field( unsigned int, type ) |
---|
189 | 189 | __field( unsigned int, line_no ) |
---|
190 | 190 | __field( int, buffer_credits ) |
---|
.. | .. |
---|
200 | 200 | __entry->requested_blocks = requested_blocks; |
---|
201 | 201 | ), |
---|
202 | 202 | |
---|
203 | | - TP_printk("dev %d,%d tid %lu type %u line_no %u " |
---|
| 203 | + TP_printk("dev %d,%d tid %u type %u line_no %u " |
---|
204 | 204 | "buffer_credits %d requested_blocks %d", |
---|
205 | 205 | MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, |
---|
206 | 206 | __entry->type, __entry->line_no, __entry->buffer_credits, |
---|
.. | .. |
---|
208 | 208 | ); |
---|
209 | 209 | |
---|
210 | 210 | TRACE_EVENT(jbd2_handle_stats, |
---|
211 | | - TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, |
---|
| 211 | + TP_PROTO(dev_t dev, tid_t tid, unsigned int type, |
---|
212 | 212 | unsigned int line_no, int interval, int sync, |
---|
213 | 213 | int requested_blocks, int dirtied_blocks), |
---|
214 | 214 | |
---|
.. | .. |
---|
217 | 217 | |
---|
218 | 218 | TP_STRUCT__entry( |
---|
219 | 219 | __field( dev_t, dev ) |
---|
220 | | - __field( unsigned long, tid ) |
---|
| 220 | + __field( tid_t, tid ) |
---|
221 | 221 | __field( unsigned int, type ) |
---|
222 | 222 | __field( unsigned int, line_no ) |
---|
223 | 223 | __field( int, interval ) |
---|
.. | .. |
---|
237 | 237 | __entry->dirtied_blocks = dirtied_blocks; |
---|
238 | 238 | ), |
---|
239 | 239 | |
---|
240 | | - TP_printk("dev %d,%d tid %lu type %u line_no %u interval %d " |
---|
| 240 | + TP_printk("dev %d,%d tid %u type %u line_no %u interval %d " |
---|
241 | 241 | "sync %d requested_blocks %d dirtied_blocks %d", |
---|
242 | 242 | MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, |
---|
243 | 243 | __entry->type, __entry->line_no, __entry->interval, |
---|
.. | .. |
---|
246 | 246 | ); |
---|
247 | 247 | |
---|
248 | 248 | TRACE_EVENT(jbd2_run_stats, |
---|
249 | | - TP_PROTO(dev_t dev, unsigned long tid, |
---|
| 249 | + TP_PROTO(dev_t dev, tid_t tid, |
---|
250 | 250 | struct transaction_run_stats_s *stats), |
---|
251 | 251 | |
---|
252 | 252 | TP_ARGS(dev, tid, stats), |
---|
253 | 253 | |
---|
254 | 254 | TP_STRUCT__entry( |
---|
255 | 255 | __field( dev_t, dev ) |
---|
256 | | - __field( unsigned long, tid ) |
---|
| 256 | + __field( tid_t, tid ) |
---|
257 | 257 | __field( unsigned long, wait ) |
---|
258 | 258 | __field( unsigned long, request_delay ) |
---|
259 | 259 | __field( unsigned long, running ) |
---|
.. | .. |
---|
279 | 279 | __entry->blocks_logged = stats->rs_blocks_logged; |
---|
280 | 280 | ), |
---|
281 | 281 | |
---|
282 | | - TP_printk("dev %d,%d tid %lu wait %u request_delay %u running %u " |
---|
| 282 | + TP_printk("dev %d,%d tid %u wait %u request_delay %u running %u " |
---|
283 | 283 | "locked %u flushing %u logging %u handle_count %u " |
---|
284 | 284 | "blocks %u blocks_logged %u", |
---|
285 | 285 | MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, |
---|
.. | .. |
---|
294 | 294 | ); |
---|
295 | 295 | |
---|
296 | 296 | TRACE_EVENT(jbd2_checkpoint_stats, |
---|
297 | | - TP_PROTO(dev_t dev, unsigned long tid, |
---|
| 297 | + TP_PROTO(dev_t dev, tid_t tid, |
---|
298 | 298 | struct transaction_chp_stats_s *stats), |
---|
299 | 299 | |
---|
300 | 300 | TP_ARGS(dev, tid, stats), |
---|
301 | 301 | |
---|
302 | 302 | TP_STRUCT__entry( |
---|
303 | 303 | __field( dev_t, dev ) |
---|
304 | | - __field( unsigned long, tid ) |
---|
| 304 | + __field( tid_t, tid ) |
---|
305 | 305 | __field( unsigned long, chp_time ) |
---|
306 | 306 | __field( __u32, forced_to_close ) |
---|
307 | 307 | __field( __u32, written ) |
---|
.. | .. |
---|
317 | 317 | __entry->dropped = stats->cs_dropped; |
---|
318 | 318 | ), |
---|
319 | 319 | |
---|
320 | | - TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u " |
---|
| 320 | + TP_printk("dev %d,%d tid %u chp_time %u forced_to_close %u " |
---|
321 | 321 | "written %u dropped %u", |
---|
322 | 322 | MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, |
---|
323 | 323 | jiffies_to_msecs(__entry->chp_time), |
---|