[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200904171144.49448.knikanth@suse.de>
Date: Fri, 17 Apr 2009 11:44:49 +0530
From: Nikanth Karthikesan <knikanth@...e.de>
To: Jens Axboe <jens.axboe@...cle.com>
Cc: David Woodhouse <David.Woodhouse@...el.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH] Fix discard requests accounting in the diskstats
When 2 discard requests are merged, the stats gets updated, but we do not
update statistics normally when a discard request is issued or completed. For
example the in_flight counter would be decremented when 2 discard requests are
merged, but it was not at all incremented when they were issued, and in_flight
counter will not be decremented, when they are completed as well.
This patch fixes this by adding discard requests to the statistics.
Signed-off-by: Nikanth Karthikesan <knikanth@...e.de>
---
diff --git a/block/blk-core.c b/block/blk-core.c
index 07ab754..ee960a7 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -68,7 +68,7 @@ static void drive_stat_acct(struct request *rq, int new_io)
int rw = rq_data_dir(rq);
int cpu;
- if (!blk_fs_request(rq) || !blk_do_io_stat(rq))
+ if (!rq_accountable(rq) || !blk_do_io_stat(rq))
return;
cpu = part_stat_lock();
@@ -1698,7 +1698,7 @@ static void blk_account_io_done(struct request *req)
* IO on queueing nor completion. Accounting the containing
* request is enough.
*/
- if (blk_fs_request(req) && req != &req->q->bar_rq) {
+ if (rq_accountable(req) && req != &req->q->bar_rq) {
unsigned long duration = jiffies - req->start_time;
const int rw = rq_data_dir(req);
struct hd_struct *part;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index ba54c83..9483c02 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -667,7 +667,9 @@ static inline void blk_clear_queue_full(struct request_queue *q, int sync)
(REQ_NOMERGE | REQ_STARTED | REQ_HARDBARRIER | REQ_SOFTBARRIER)
#define rq_mergeable(rq) \
(!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \
- (blk_discard_rq(rq) || blk_fs_request((rq))))
+ (blk_discard_rq(rq) || blk_fs_request(rq)))
+#define rq_accountable(rq) \
+ (blk_discard_rq(rq) || blk_fs_request(rq))
/*
* q->prep_rq_fn return values
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists