Skip to content

Commit 2fc5f0c

Browse files
Li ZefanIngo Molnar
authored andcommitted
trace_stack: Simplify seqfile code
Extract duplicate code in t_start() and t_next(). Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <4A891A91.4030602@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
1 parent 97d5320 commit 2fc5f0c

File tree

1 file changed

+12
-22
lines changed

1 file changed

+12
-22
lines changed

kernel/trace/trace_stack.c

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -186,43 +186,33 @@ static const struct file_operations stack_max_size_fops = {
186186
};
187187

188188
static void *
189-
t_next(struct seq_file *m, void *v, loff_t *pos)
189+
__next(struct seq_file *m, loff_t *pos)
190190
{
191-
long i;
191+
long n = *pos - 1;
192192

193-
(*pos)++;
194-
195-
if (v == SEQ_START_TOKEN)
196-
i = 0;
197-
else {
198-
i = *(long *)v;
199-
i++;
200-
}
201-
202-
if (i >= max_stack_trace.nr_entries ||
203-
stack_dump_trace[i] == ULONG_MAX)
193+
if (n >= max_stack_trace.nr_entries || stack_dump_trace[n] == ULONG_MAX)
204194
return NULL;
205195

206-
m->private = (void *)i;
207-
196+
m->private = (void *)n;
208197
return &m->private;
209198
}
210199

211-
static void *t_start(struct seq_file *m, loff_t *pos)
200+
static void *
201+
t_next(struct seq_file *m, void *v, loff_t *pos)
212202
{
213-
void *t = SEQ_START_TOKEN;
214-
loff_t l = 0;
203+
(*pos)++;
204+
return __next(m, pos);
205+
}
215206

207+
static void *t_start(struct seq_file *m, loff_t *pos)
208+
{
216209
local_irq_disable();
217210
__raw_spin_lock(&max_stack_lock);
218211

219212
if (*pos == 0)
220213
return SEQ_START_TOKEN;
221214

222-
for (; t && l < *pos; t = t_next(m, t, &l))
223-
;
224-
225-
return t;
215+
return __next(m, pos);
226216
}
227217

228218
static void t_stop(struct seq_file *m, void *p)

0 commit comments

Comments
 (0)