hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/include/trace/events/jbd2.h
....@@ -40,7 +40,7 @@
4040 TP_STRUCT__entry(
4141 __field( dev_t, dev )
4242 __field( char, sync_commit )
43
- __field( int, transaction )
43
+ __field( tid_t, transaction )
4444 ),
4545
4646 TP_fast_assign(
....@@ -49,7 +49,7 @@
4949 __entry->transaction = commit_transaction->t_tid;
5050 ),
5151
52
- TP_printk("dev %d,%d transaction %d sync %d",
52
+ TP_printk("dev %d,%d transaction %u sync %d",
5353 MAJOR(__entry->dev), MINOR(__entry->dev),
5454 __entry->transaction, __entry->sync_commit)
5555 );
....@@ -97,8 +97,8 @@
9797 TP_STRUCT__entry(
9898 __field( dev_t, dev )
9999 __field( char, sync_commit )
100
- __field( int, transaction )
101
- __field( int, head )
100
+ __field( tid_t, transaction )
101
+ __field( tid_t, head )
102102 ),
103103
104104 TP_fast_assign(
....@@ -108,7 +108,7 @@
108108 __entry->head = journal->j_tail_sequence;
109109 ),
110110
111
- TP_printk("dev %d,%d transaction %d sync %d head %d",
111
+ TP_printk("dev %d,%d transaction %u sync %d head %u",
112112 MAJOR(__entry->dev), MINOR(__entry->dev),
113113 __entry->transaction, __entry->sync_commit, __entry->head)
114114 );
....@@ -134,14 +134,14 @@
134134 );
135135
136136 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,
138138 unsigned int line_no, int requested_blocks),
139139
140140 TP_ARGS(dev, tid, type, line_no, requested_blocks),
141141
142142 TP_STRUCT__entry(
143143 __field( dev_t, dev )
144
- __field( unsigned long, tid )
144
+ __field( tid_t, tid )
145145 __field( unsigned int, type )
146146 __field( unsigned int, line_no )
147147 __field( int, requested_blocks)
....@@ -155,28 +155,28 @@
155155 __entry->requested_blocks = requested_blocks;
156156 ),
157157
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 "
159159 "requested_blocks %d",
160160 MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
161161 __entry->type, __entry->line_no, __entry->requested_blocks)
162162 );
163163
164164 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,
166166 unsigned int line_no, int requested_blocks),
167167
168168 TP_ARGS(dev, tid, type, line_no, requested_blocks)
169169 );
170170
171171 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,
173173 unsigned int line_no, int requested_blocks),
174174
175175 TP_ARGS(dev, tid, type, line_no, requested_blocks)
176176 );
177177
178178 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,
180180 unsigned int line_no, int buffer_credits,
181181 int requested_blocks),
182182
....@@ -184,7 +184,7 @@
184184
185185 TP_STRUCT__entry(
186186 __field( dev_t, dev )
187
- __field( unsigned long, tid )
187
+ __field( tid_t, tid )
188188 __field( unsigned int, type )
189189 __field( unsigned int, line_no )
190190 __field( int, buffer_credits )
....@@ -200,7 +200,7 @@
200200 __entry->requested_blocks = requested_blocks;
201201 ),
202202
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 "
204204 "buffer_credits %d requested_blocks %d",
205205 MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
206206 __entry->type, __entry->line_no, __entry->buffer_credits,
....@@ -208,7 +208,7 @@
208208 );
209209
210210 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,
212212 unsigned int line_no, int interval, int sync,
213213 int requested_blocks, int dirtied_blocks),
214214
....@@ -217,7 +217,7 @@
217217
218218 TP_STRUCT__entry(
219219 __field( dev_t, dev )
220
- __field( unsigned long, tid )
220
+ __field( tid_t, tid )
221221 __field( unsigned int, type )
222222 __field( unsigned int, line_no )
223223 __field( int, interval )
....@@ -237,7 +237,7 @@
237237 __entry->dirtied_blocks = dirtied_blocks;
238238 ),
239239
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 "
241241 "sync %d requested_blocks %d dirtied_blocks %d",
242242 MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
243243 __entry->type, __entry->line_no, __entry->interval,
....@@ -246,14 +246,14 @@
246246 );
247247
248248 TRACE_EVENT(jbd2_run_stats,
249
- TP_PROTO(dev_t dev, unsigned long tid,
249
+ TP_PROTO(dev_t dev, tid_t tid,
250250 struct transaction_run_stats_s *stats),
251251
252252 TP_ARGS(dev, tid, stats),
253253
254254 TP_STRUCT__entry(
255255 __field( dev_t, dev )
256
- __field( unsigned long, tid )
256
+ __field( tid_t, tid )
257257 __field( unsigned long, wait )
258258 __field( unsigned long, request_delay )
259259 __field( unsigned long, running )
....@@ -279,7 +279,7 @@
279279 __entry->blocks_logged = stats->rs_blocks_logged;
280280 ),
281281
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 "
283283 "locked %u flushing %u logging %u handle_count %u "
284284 "blocks %u blocks_logged %u",
285285 MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
....@@ -294,14 +294,14 @@
294294 );
295295
296296 TRACE_EVENT(jbd2_checkpoint_stats,
297
- TP_PROTO(dev_t dev, unsigned long tid,
297
+ TP_PROTO(dev_t dev, tid_t tid,
298298 struct transaction_chp_stats_s *stats),
299299
300300 TP_ARGS(dev, tid, stats),
301301
302302 TP_STRUCT__entry(
303303 __field( dev_t, dev )
304
- __field( unsigned long, tid )
304
+ __field( tid_t, tid )
305305 __field( unsigned long, chp_time )
306306 __field( __u32, forced_to_close )
307307 __field( __u32, written )
....@@ -317,7 +317,7 @@
317317 __entry->dropped = stats->cs_dropped;
318318 ),
319319
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 "
321321 "written %u dropped %u",
322322 MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
323323 jiffies_to_msecs(__entry->chp_time),