From patchwork Mon Nov 28 12:20:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 127973 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DF6E4B6F94 for ; Mon, 28 Nov 2011 23:18:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753498Ab1K1MSk (ORCPT ); Mon, 28 Nov 2011 07:18:40 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:53709 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455Ab1K1MSj (ORCPT ); Mon, 28 Nov 2011 07:18:39 -0500 Received: by mail-iy0-f174.google.com with SMTP id e36so8873378iag.19 for ; Mon, 28 Nov 2011 04:18:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=pjum6snqRuUY3dvvjJ4wO5w6XMeQUvtZCHETks7QpsY=; b=IvjJJQW5zQt9IDUmCwuEcDdSsp25ZkFFAvCjmF3/Xo8bWWq9r8dy6eQaAXs5R7zmG1 bVtLkkl2bbQi5ghOw0bajjqwPBWS23xxoZbZD15P3g7gnHXsKx+Yqv1hjy2NXpYhRiZl CiCudaAycN4IHSk7MJXPtENu+9198HG/UzOJM= Received: by 10.42.173.71 with SMTP id q7mr23755167icz.43.1322482719087; Mon, 28 Nov 2011 04:18:39 -0800 (PST) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id cb15sm40036924ibb.4.2011.11.28.04.18.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Nov 2011 04:18:38 -0800 (PST) From: Zheng Liu To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org Cc: Jens Axboe , Steven Whitehouse , Aditya Kali , Wang Shaoyan , Zheng Liu Subject: [PATCH v3 4/8] ext4: account the data request of read operations in buffered io Date: Mon, 28 Nov 2011 20:20:24 +0800 Message-Id: <1322482828-5529-4-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1322482828-5529-1-git-send-email-wenqing.lz@taobao.com> References: <1322482392-5346-1-git-send-email-wenqing.lz@taobao.com> <1322482828-5529-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu ll_rw_block in ext4_discard_partial_page_buffers_no_lock and ext4_block_zero_page_range are replaced with ext4_ll_rw_block, and ext4_ios_read are called in ext4_readpage and ext4_readpages in order to account the data request. CC: Jens Axboe CC: Steven Whitehouse CC: Aditya Kali Signed-off-by: Wang Shaoyan Signed-off-by: Zheng Liu --- fs/ext4/inode.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 52fcaab..426ac55 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2679,6 +2679,8 @@ static sector_t ext4_bmap(struct address_space *mapping, sector_t block) static int ext4_readpage(struct file *file, struct page *page) { trace_ext4_readpage(page); + ext4_ios_read(page->mapping->host->i_sb, EXT4_IOS_REGULAR_DATA, + ext4_blocks_per_page(page->mapping->host)); return mpage_readpage(page, ext4_get_block); } @@ -2686,6 +2688,8 @@ static int ext4_readpages(struct file *file, struct address_space *mapping, struct list_head *pages, unsigned nr_pages) { + ext4_ios_read(mapping->host->i_sb, EXT4_IOS_REGULAR_DATA, + ext4_blocks_per_page(mapping->host)); return mpage_readpages(mapping, pages, nr_pages, ext4_get_block); } @@ -3300,12 +3304,12 @@ int ext4_discard_partial_page_buffers_no_lock(handle_t *handle, if (PageUptodate(page)) set_buffer_uptodate(bh); - if (!buffer_uptodate(bh)) { - err = -EIO; - ll_rw_block(READ, 1, &bh); - wait_on_buffer(bh); + if (!bh_uptodate_or_lock(bh)) { + err = ext4_submit_bh_read(READ, bh, inode->i_sb, + EXT4_IOS_REGULAR_DATA, + ext4_blocks_per_page(inode)); /* Uhhuh. Read error. Complain and punt.*/ - if (!buffer_uptodate(bh)) + if (err) goto next; } @@ -3422,12 +3426,11 @@ int ext4_block_zero_page_range(handle_t *handle, if (PageUptodate(page)) set_buffer_uptodate(bh); - if (!buffer_uptodate(bh)) { - err = -EIO; - ll_rw_block(READ, 1, &bh); - wait_on_buffer(bh); + if (!bh_uptodate_or_lock(bh)) { + err = ext4_submit_bh_read(READ, bh, inode->i_sb, + EXT4_IOS_REGULAR_DATA, 1); /* Uhhuh. Read error. Complain and punt. */ - if (!buffer_uptodate(bh)) + if (err) goto unlock; }