From patchwork Mon Jan 23 16:50:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 137413 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 8E8B9B6FA2 for ; Tue, 24 Jan 2012 03:46:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752669Ab2AWQqu (ORCPT ); Mon, 23 Jan 2012 11:46:50 -0500 Received: from mail-gx0-f174.google.com ([209.85.161.174]:36307 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751122Ab2AWQqt (ORCPT ); Mon, 23 Jan 2012 11:46:49 -0500 Received: by mail-gx0-f174.google.com with SMTP id b1so1418695ggn.19 for ; Mon, 23 Jan 2012 08:46:49 -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=T8kufyIkv3+Nhnshsj+FbXljMPf/fTKg9r0m0zWxObk=; b=QHJ7lN/jKuEdgJmdz23lJcmKBeXJDzenGgkxUDBAeUgHjdo72B031ervXvOBTHaG+J 8tvagpSbt4o9kqpgQq1ztv48nrK84iopfgVX9kv0GZpHBWUHLf8g4MysHHpYv23MR6ZP GfkVAZP6aO6wUj6DjTG8yn5m7uXYqwQmvPB88= Received: by 10.50.202.105 with SMTP id kh9mr11298746igc.3.1327337209150; Mon, 23 Jan 2012 08:46:49 -0800 (PST) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id l28sm48715136ibc.3.2012.01.23.08.46.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jan 2012 08:46:48 -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 2/8] ext4: add wrapper functions for buffer layer Date: Tue, 24 Jan 2012 00:50:22 +0800 Message-Id: <1327337428-8266-3-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 Wrapper functions are defined to account the result of different IO type. CC: Jens Axboe CC: Steven Whitehouse CC: Aditya Kali Signed-off-by: Wang Shaoyan Signed-off-by: Zheng Liu --- fs/ext4/ext4.h | 21 +++++++++++++++ fs/ext4/super.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 7ec0596..688891e 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1968,6 +1968,27 @@ static inline void ext4_ios_read(struct super_block *sb, int type, __ext4_io_stat(sb, READ, type, count); } +extern void ext4_submit_bh_read_nowait(int rw, struct buffer_head *bh, + struct super_block *sb, int type, + unsigned long count); +extern int ext4_submit_bh_read(int rw, struct buffer_head *bh, + struct super_block *sb, int type, + unsigned long count); +extern void ext4_submit_bh_write_nowait(int rw, struct buffer_head *bh, + struct super_block *sb, int type, + unsigned long count); +extern struct buffer_head *ext4_sb_bread(struct super_block *sb, sector_t block, + int type, unsigned long count); +extern void ext4_sb_breadahead(struct super_block *sb, + sector_t block, int type); + +static inline int ext4_bh_submit_read(struct buffer_head *bh, + struct super_block *sb, + int type, unsigned long count) +{ + return ext4_submit_bh_read(READ, bh, sb, type, count); +} + extern void *ext4_kvmalloc(size_t size, gfp_t flags); extern void *ext4_kvzalloc(size_t size, gfp_t flags); extern void ext4_kvfree(void *ptr); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index f3a5cab..305ece7 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4999,6 +4999,84 @@ count: __ext4_io_stat(sb, WRITE, type, count); } +void ext4_submit_bh_read_nowait(int rw, struct buffer_head *bh, + struct super_block *sb, int type, + unsigned long count) +{ + BUG_ON(rw & WRITE); + BUG_ON(!buffer_locked(bh)); + + /* IO type accouting */ + ext4_ios_read(sb, type, count); + + get_bh(bh); + bh->b_end_io = end_buffer_read_sync; + submit_bh(rw, bh); +} + +int ext4_submit_bh_read(int rw, struct buffer_head *bh, struct super_block *sb, + int type, unsigned long count) +{ + BUG_ON(rw & WRITE); + BUG_ON(!buffer_locked(bh)); + + if (buffer_uptodate(bh)) { + unlock_buffer(bh); + return 0; + } + + ext4_submit_bh_read_nowait(rw, bh, sb, type, count); + wait_on_buffer(bh); + if (buffer_uptodate(bh)) + return 0; + return -EIO; +} + +void ext4_submit_bh_write_nowait(int rw, struct buffer_head *bh, + struct super_block *sb, int type, + unsigned long count) +{ + BUG_ON(!(rw & WRITE)); + BUG_ON(!buffer_locked(bh)); + + /* IO type accouting */ + ext4_ios_write(sb, NULL, NULL, type, count); + + get_bh(bh); + bh->b_end_io = end_buffer_write_sync; + submit_bh(rw, bh); +} + +struct buffer_head *ext4_sb_bread(struct super_block *sb, sector_t block, + int type, unsigned long count) +{ + struct buffer_head *bh = __getblk(sb->s_bdev, block, sb->s_blocksize); + + if (likely(bh) && !buffer_uptodate(bh)) { + lock_buffer(bh); + if (ext4_submit_bh_read(READ, bh, sb, type, count)) { + brelse(bh); + bh = NULL; + } + } + return bh; +} + +void ext4_sb_breadahead(struct super_block *sb, sector_t block, int type) +{ + struct buffer_head *bh = __getblk(sb->s_bdev, block, sb->s_blocksize); + if (likely(bh)) { + if (trylock_buffer(bh)) { + if (buffer_uptodate(bh)) + ext4_submit_bh_read_nowait(READ, bh, sb, + type, 1); + else + unlock_buffer(bh); + } + brelse(bh); + } +} + static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {