From 5b3023b818d5127504b4889f8f718c3cef62700b Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 7 Mar 2008 13:20:54 +0100 Subject: [PATCH] blktrace bits accidentally got committed It was the start of handling notifies correctly, didn't mean to commit them with the previous fix. So roll them out, commit when done. Signed-off-by: Jens Axboe --- blktrace.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/blktrace.c b/blktrace.c index 111619c6..b7071808 100644 --- a/blktrace.c +++ b/blktrace.c @@ -204,29 +204,6 @@ static void store_ipo(struct thread_data *td, unsigned long long offset, list_add_tail(&ipo->list, &td->io_log_list); } -static void handle_trace_notify(struct thread_data *td, struct blk_io_trace *t) -{ - printf("got notify: %x, %d\n", t->action, t->pid); -} - -static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t, - unsigned long long ttime, unsigned long *ios, - unsigned int *bs) -{ - int rw; - - trace_add_file(td, t->device); - - rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0; - - if (t->bytes > bs[rw]) - bs[rw] = t->bytes; - - ios[rw]++; - td->o.size += t->bytes; - store_ipo(td, t->sector, t->bytes, rw, ttime); -} - /* * We only care for queue traces, most of the others are side effects * due to internal workings of the block layer. @@ -235,15 +212,25 @@ static void handle_trace(struct thread_data *td, struct blk_io_trace *t, unsigned long long ttime, unsigned long *ios, unsigned int *bs) { + int rw; + if ((t->action & 0xffff) != __BLK_TA_QUEUE) return; if (t->action & BLK_TC_ACT(BLK_TC_PC)) return; - if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY)) - handle_trace_notify(td, t); - else - handle_trace_fs(td, t, ttime, ios, bs); + return; + + trace_add_file(td, t->device); + + rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0; + + if (t->bytes > bs[rw]) + bs[rw] = t->bytes; + + ios[rw]++; + td->o.size += t->bytes; + store_ipo(td, t->sector, t->bytes, rw, ttime); } /* -- 2.25.1