Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755589AbZDXFu5 (ORCPT ); Fri, 24 Apr 2009 01:50:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752265AbZDXFus (ORCPT ); Fri, 24 Apr 2009 01:50:48 -0400 Received: from cantor.suse.de ([195.135.220.2]:43701 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750832AbZDXFus (ORCPT ); Fri, 24 Apr 2009 01:50:48 -0400 From: Nikanth Karthikesan Organization: suse.de To: Jens Axboe Subject: [PATCH linux-2.6-block/for-linus] Fix discard requests accounting in the diskstats Date: Fri, 24 Apr 2009 11:18:30 +0530 User-Agent: KMail/1.11.1 (Linux/2.6.27.21-0.1-default; KDE/4.2.1; x86_64; ; ) Cc: Andrew Morton , dwmw2@infradead.org, linux-kernel@vger.kernel.org References: <200904232013.n3NKD4PP017241@imap1.linux-foundation.org> <20090423140448.c2d34fb8.akpm@linux-foundation.org> <20090424051612.GT4593@kernel.dk> In-Reply-To: <20090424051612.GT4593@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200904241118.30919.knikanth@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2124 Lines: 55 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 --- diff --git a/block/blk-core.c b/block/blk-core.c index 2998fe3..0175b9f 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(); @@ -1700,7 +1700,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 2755d5c..a54d3ba 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -670,7 +670,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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/