---

yaml --- r: 141049 b: refs/heads/master c: cbe2829 h: refs/heads/master i: 141047: ed38a74 v: v3
git-mirror · Mar 21, 2009 · 499f3f8 · 499f3f8
1 parent b28f815
commit 499f3f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c289ba7c320560ee74979a8895141c829046a2d
+refs/heads/master: cbe28296eb1ac441b35cf45804d0ae808add7dd1
diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c
@@ -468,16 +468,16 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
 	bt->pid = buts->pid;
 	bt->trace_state = Blktrace_setup;
 
-	if (atomic_add_return(1, &blk_probes_ref) == 1)
-		blk_register_tracepoints();
-
 	ret = -EBUSY;
 	old_bt = xchg(&q->blk_trace, bt);
 	if (old_bt) {
 		(void) xchg(&q->blk_trace, old_bt);
 		goto err;
 	}
 
+	if (atomic_add_return(1, &blk_probes_ref) == 1)
+		blk_register_tracepoints();
+
 	return 0;
 err:
 	if (bt) {