[RFC Patch 5/5] Blktrace - Remove trace_state and associated flags from blktrace.[ch]

[K.Prasad]

This patch removes the 'trace_state' flag from blk_trace structure, since  
the
state transitions will now be managed using 'trace' infrastructure.

Signed-off-by: K.Prasad <prasad@xxxxxxxxxxxxxxxxxx>
---
 block/blktrace.c             |   26 +++++++-------------------
 include/linux/blktrace_api.h |    7 -------
 2 files changed, 7 insertions(+), 26 deletions(-)

Index: linux-blktrace-many/include/linux/blktrace_api.h
===================================================================
--- linux-blktrace-many.orig/include/linux/blktrace_api.h
+++ linux-blktrace-many/include/linux/blktrace_api.h
@@ -110,14 +110,7 @@ struct blk_io_trace_remap {
 	__be64 sector;
 };

-enum {
-	Blktrace_setup = 1,
-	Blktrace_running,
-	Blktrace_stopped,
-};
-
 struct blk_trace {
-	int trace_state;
 	unsigned long *sequence;
 	u16 act_mask;
 	u64 start_lba;
Index: linux-blktrace-many/block/blktrace.c
===================================================================
--- linux-blktrace-many.orig/block/blktrace.c
+++ linux-blktrace-many/block/blktrace.c
@@ -127,9 +127,6 @@ void __blk_add_trace(struct blk_trace *b
 	pid_t pid;
 	int cpu;

-	if (unlikely(bt->trace_state != Blktrace_running))
-		return;
-
 	what |= ddir_act[rw & WRITE];
 	what |= bio_act[trace_barrier_bit(rw)];
 	what |= bio_act[trace_sync_bit(rw)];
@@ -199,8 +196,7 @@ int blk_trace_remove(struct request_queu
 	if (!bt)
 		return -EINVAL;

-	if (bt->trace_state == Blktrace_setup ||
-	    bt->trace_state == Blktrace_stopped)
+	if(!trace_running(bt->tpk->ti))
 		blk_trace_cleanup(bt);

 	return 0;
@@ -262,7 +258,6 @@ int do_blk_trace_setup(struct request_qu
 		bt->end_lba = -1ULL;

 	bt->pid = buts->pid;
-	bt->trace_state = Blktrace_setup;

 	ret = -EBUSY;
 	old_bt = xchg(&q->blk_trace, bt);
@@ -319,20 +314,13 @@ int blk_trace_startstop(struct request_q
 	 */
 	ret = -EINVAL;
 	if (start) {
-		if (bt->trace_state == Blktrace_setup ||
-		    bt->trace_state == Blktrace_stopped) {
-			blktrace_seq++;
-			smp_mb();
-			bt->trace_state = Blktrace_running;
-
-			trace_note_time(bt);
-			ret = 0;
-		}
+		blktrace_seq++;
+		smp_mb();
+		trace_note_time(bt);
+		ret = 0;
 	} else {
-		if (bt->trace_state == Blktrace_running) {
-			bt->trace_state = Blktrace_stopped;
-			ret = 0;
-		}
+		trace_stop(bt->tpk->ti);
+		ret = 0;
 	}

 	return ret;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/