lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

blktrace: remove blk_probe_mutex

Browse Source 
blk_register_tracepoints() always returns 0, so make it return void,
thus we don't need to use blk_probe_mutex to protect blk_probes_ref.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <49C2F5EA.8060606@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Li Zefan
2009-03-20 09:48:26 +08:00
committed by Ingo Molnar
parent 5006ea73f3
commit 3c289ba7c3
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/trace/blktrace.c
View File

@@ -47,10 +47,9 @@ static struct tracer_flags blk_tracer_flags = {
}; };
/* Global reference count of probes */ /* Global reference count of probes */
static DEFINE_MUTEX(blk_probe_mutex);
static atomic_t blk_probes_ref = ATOMIC_INIT(0); static atomic_t blk_probes_ref = ATOMIC_INIT(0);
static int blk_register_tracepoints(void); static void blk_register_tracepoints(void);
static void blk_unregister_tracepoints(void); static void blk_unregister_tracepoints(void);
/* /*
@@ -256,10 +255,8 @@ static void blk_trace_cleanup(struct blk_trace *bt)
free_percpu(bt->sequence); free_percpu(bt->sequence);
free_percpu(bt->msg_data); free_percpu(bt->msg_data);
kfree(bt); kfree(bt);
mutex_lock(&blk_probe_mutex);
if (atomic_dec_and_test(&blk_probes_ref)) if (atomic_dec_and_test(&blk_probes_ref))
blk_unregister_tracepoints(); blk_unregister_tracepoints();
mutex_unlock(&blk_probe_mutex);
} }
int blk_trace_remove(struct request_queue *q) int blk_trace_remove(struct request_queue *q)
@@ -471,13 +468,8 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
bt->pid = buts->pid; bt->pid = buts->pid;
bt->trace_state = Blktrace_setup; bt->trace_state = Blktrace_setup;
mutex_lock(&blk_probe_mutex); if (atomic_add_return(1, &blk_probes_ref) == 1)
if (atomic_add_return(1, &blk_probes_ref) == 1) { blk_register_tracepoints();
ret = blk_register_tracepoints();
if (ret)
goto probe_err;
}
mutex_unlock(&blk_probe_mutex);
ret = -EBUSY; ret = -EBUSY;
old_bt = xchg(&q->blk_trace, bt); old_bt = xchg(&q->blk_trace, bt);
@@ -487,9 +479,6 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
} }
return 0; return 0;
probe_err:
atomic_dec(&blk_probes_ref);
mutex_unlock(&blk_probe_mutex);
err: err:
if (bt) { if (bt) {
if (bt->msg_file) if (bt->msg_file)
@@ -863,7 +852,7 @@ void blk_add_driver_data(struct request_queue *q,
} }
EXPORT_SYMBOL_GPL(blk_add_driver_data); EXPORT_SYMBOL_GPL(blk_add_driver_data);
static int blk_register_tracepoints(void) static void blk_register_tracepoints(void)
{ {
int ret; int ret;
@@ -901,7 +890,6 @@ static int blk_register_tracepoints(void)
WARN_ON(ret); WARN_ON(ret);
ret = register_trace_block_remap(blk_add_trace_remap); ret = register_trace_block_remap(blk_add_trace_remap);
WARN_ON(ret); WARN_ON(ret);
return 0;
} }
static void blk_unregister_tracepoints(void) static void blk_unregister_tracepoints(void)
@@ -1099,11 +1087,8 @@ static void blk_tracer_print_header(struct seq_file *m)
static void blk_tracer_start(struct trace_array *tr) static void blk_tracer_start(struct trace_array *tr)
{ {
mutex_lock(&blk_probe_mutex);
if (atomic_add_return(1, &blk_probes_ref) == 1) if (atomic_add_return(1, &blk_probes_ref) == 1)
if (blk_register_tracepoints()) blk_register_tracepoints();
atomic_dec(&blk_probes_ref);
mutex_unlock(&blk_probe_mutex);
trace_flags &= ~TRACE_ITER_CONTEXT_INFO; trace_flags &= ~TRACE_ITER_CONTEXT_INFO;
} }
@@ -1118,10 +1103,8 @@ static int blk_tracer_init(struct trace_array *tr)
static void blk_tracer_stop(struct trace_array *tr) static void blk_tracer_stop(struct trace_array *tr)
{ {
trace_flags |= TRACE_ITER_CONTEXT_INFO; trace_flags |= TRACE_ITER_CONTEXT_INFO;
mutex_lock(&blk_probe_mutex);
if (atomic_dec_and_test(&blk_probes_ref)) if (atomic_dec_and_test(&blk_probes_ref))
blk_unregister_tracepoints(); blk_unregister_tracepoints();
mutex_unlock(&blk_probe_mutex);
} }
static void blk_tracer_reset(struct trace_array *tr) static void blk_tracer_reset(struct trace_array *tr)