From patchwork Mon Jan 23 16:50:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 137415 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 2DD1CB6FA2 for ; Tue, 24 Jan 2012 03:47:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752795Ab2AWQq6 (ORCPT ); Mon, 23 Jan 2012 11:46:58 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:58382 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752785Ab2AWQq6 (ORCPT ); Mon, 23 Jan 2012 11:46:58 -0500 Received: by mail-gy0-f174.google.com with SMTP id r11so306018ghr.19 for ; Mon, 23 Jan 2012 08:46:57 -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=7FZ8+eymmFgEDtXxwBb+uoJuEdErI+v0gpJX9B/MKCg=; b=e2wNq3tbn7opC4GGVFTS12Je9wvbO3mv8qyW4zBjcpawwa/FcalF3EHPf+OvMEYFrA P8Tnuon9WLBoHmxE9yiHBiGVL17nv6dzxpneg7sC65OdgmZWJCjmR1TaLLw8quI/GmAf YNQvTpWJGLrTdBx5Woc1zWRog5pT5SGVgtlcs= Received: by 10.50.159.234 with SMTP id xf10mr4939543igb.21.1327337216848; Mon, 23 Jan 2012 08:46:56 -0800 (PST) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id l28sm48715136ibc.3.2012.01.23.08.46.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jan 2012 08:46:56 -0800 (PST) From: Zheng Liu To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Zheng Liu , Jens Axboe , Steven Whitehouse , Aditya Kali , Wang Shaoyan Subject: [PATCH v4 4/8] ext4: account the data request of read operations in buffered io Date: Tue, 24 Jan 2012 00:50:24 +0800 Message-Id: <1327337428-8266-5-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1327337428-8266-1-git-send-email-wenqing.lz@taobao.com> References: <1327337428-8266-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 ll_rw_block in ext4_discard_partial_page_buffers_no_lock is replaced with ext4_submit_bh_read, 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 | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index b68d129..ff56658 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2665,6 +2665,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); } @@ -2672,6 +2674,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); } @@ -3268,12 +3272,12 @@ static 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; }