diff options
Diffstat (limited to 'kernel/trace/blktrace.c')
| -rw-r--r-- | kernel/trace/blktrace.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 973d41d81aa5..b2fcf472774e 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1343,6 +1343,7 @@ static const struct {  static enum print_line_t print_one_line(struct trace_iterator *iter,  					bool classic)  { +	struct trace_array *tr = iter->tr;  	struct trace_seq *s = &iter->seq;  	const struct blk_io_trace *t;  	u16 what; @@ -1351,7 +1352,7 @@ static enum print_line_t print_one_line(struct trace_iterator *iter,  	t	   = te_blk_io_trace(iter->ent);  	what	   = t->action & ((1 << BLK_TC_SHIFT) - 1); -	long_act   = !!(trace_flags & TRACE_ITER_VERBOSE); +	long_act   = !!(tr->trace_flags & TRACE_ITER_VERBOSE);  	log_action = classic ? &blk_log_action_classic : &blk_log_action;  	if (t->action == BLK_TN_MESSAGE) { @@ -1413,9 +1414,9 @@ blk_tracer_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)  	/* don't output context-info for blk_classic output */  	if (bit == TRACE_BLK_OPT_CLASSIC) {  		if (set) -			trace_flags &= ~TRACE_ITER_CONTEXT_INFO; +			tr->trace_flags &= ~TRACE_ITER_CONTEXT_INFO;  		else -			trace_flags |= TRACE_ITER_CONTEXT_INFO; +			tr->trace_flags |= TRACE_ITER_CONTEXT_INFO;  	}  	return 0;  } | 
