From patchwork Mon Feb 20 07:01:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ma X-Patchwork-Id: 142123 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 27F01B6FAA for ; Mon, 20 Feb 2012 18:03:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751727Ab2BTHCi (ORCPT ); Mon, 20 Feb 2012 02:02:38 -0500 Received: from oproxy7-pub.bluehost.com ([67.222.55.9]:39842 "HELO oproxy7-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751506Ab2BTHCh (ORCPT ); Mon, 20 Feb 2012 02:02:37 -0500 Received: (qmail 3092 invoked by uid 0); 20 Feb 2012 07:02:37 -0000 Received: from unknown (HELO box585.bluehost.com) (66.147.242.185) by oproxy7.bluehost.com with SMTP; 20 Feb 2012 07:02:37 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tao.ma; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=wblet+/ugZVtlOXi9bYSKai4fRfsFtaZ4OYVwiG/K98=; b=HVNoqCI7NZusyB/RVMGSwIbjU/w5pVRWOeHK1MNMHRSyoNdBDkgZXPAFUkjB60gZtDcGM/vEvQqCSqbBSjyrAS4d8RR/i4S8SFIQxis6AipzNGN+qa7akZsp9AkTqddB; Received: from [182.92.247.2] (helo=tma-laptop1.taobao.ali.com) by box585.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RzNGe-0000US-9b; Mon, 20 Feb 2012 00:02:37 -0700 From: Tao Ma To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH V4 06/22] ext4: Add journalled write support for inline data. Date: Mon, 20 Feb 2012 15:01:40 +0800 Message-Id: <1329721316-4955-6-git-send-email-tm@tao.ma> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1329721316-4955-1-git-send-email-tm@tao.ma> References: <4F41EF95.2000909@tao.ma> <1329721316-4955-1-git-send-email-tm@tao.ma> X-Identified-User: {1390:box585.bluehost.com:colyli:tao.ma} {sentby:smtp auth 182.92.247.2 authed with tm@tao.ma} Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Tao Ma Signed-off-by: Tao Ma --- fs/ext4/inline.c | 24 ++++++++++++++++++++++ fs/ext4/inode.c | 59 +++++++++++++++++++++++++++++++++++++---------------- fs/ext4/xattr.h | 12 +++++++++++ 3 files changed, 77 insertions(+), 18 deletions(-) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 4946a24..94359f0 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -736,6 +736,30 @@ out: return copied; } +struct buffer_head * +ext4_journalled_write_inline_data(struct inode *inode, + unsigned len, + struct page *page) +{ + int ret; + void *kaddr; + struct ext4_iloc iloc; + + ret = ext4_get_inode_loc(inode, &iloc); + if (ret) { + ext4_std_error(inode->i_sb, ret); + return NULL; + } + + down_write(&EXT4_I(inode)->xattr_sem); + kaddr = kmap_atomic(page, KM_USER0); + ext4_write_inline_data(inode, &iloc, kaddr, 0, len); + kunmap_atomic(kaddr, KM_USER0); + up_write(&EXT4_I(inode)->xattr_sem); + + return iloc.bh; +} + int ext4_destroy_inline_data(handle_t *handle, struct inode *inode) { diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index bae79b4..e4bcae5 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1064,16 +1064,21 @@ static int ext4_journalled_write_end(struct file *file, BUG_ON(!ext4_handle_valid(handle)); - if (copied < len) { - if (!PageUptodate(page)) - copied = 0; - page_zero_new_buffers(page, from+copied, to); - } + if (ext4_has_inline_data(inode)) + copied = ext4_write_inline_data_end(inode, pos, len, + copied, page); + else { + if (copied < len) { + if (!PageUptodate(page)) + copied = 0; + page_zero_new_buffers(page, from+copied, to); + } - ret = walk_page_buffers(handle, page_buffers(page), from, - to, &partial, write_end_fn); - if (!partial) - SetPageUptodate(page); + ret = walk_page_buffers(handle, page_buffers(page), from, + to, &partial, write_end_fn); + if (!partial) + SetPageUptodate(page); + } new_i_size = pos + copied; if (new_i_size > inode->i_size) i_size_write(inode, pos+copied); @@ -1835,15 +1840,23 @@ static int __ext4_journalled_writepage(struct page *page, { struct address_space *mapping = page->mapping; struct inode *inode = mapping->host; - struct buffer_head *page_bufs; + struct buffer_head *page_bufs = NULL; handle_t *handle = NULL; int ret = 0; int err; + struct buffer_head *inode_bh = NULL; ClearPageChecked(page); - page_bufs = page_buffers(page); - BUG_ON(!page_bufs); - walk_page_buffers(handle, page_bufs, 0, len, NULL, bget_one); + + if (ext4_has_inline_data(inode)) { + BUG_ON(page->index != 0); + BUG_ON(len > ext4_get_max_inline_size(inode)); + inode_bh = ext4_journalled_write_inline_data(inode, len, page); + } else { + page_bufs = page_buffers(page); + BUG_ON(!page_bufs); + walk_page_buffers(handle, page_bufs, 0, len, NULL, bget_one); + } /* As soon as we unlock the page, it can go away, but we have * references to buffers so we are safe */ unlock_page(page); @@ -1856,11 +1869,19 @@ static int __ext4_journalled_writepage(struct page *page, BUG_ON(!ext4_handle_valid(handle)); - ret = walk_page_buffers(handle, page_bufs, 0, len, NULL, - do_journal_get_write_access); + if (ext4_has_inline_data(inode) && inode_bh) { + ret = ext4_journal_get_write_access(handle, inode_bh); + + err = ext4_handle_dirty_metadata(handle, inode, inode_bh); + + } else { + ret = walk_page_buffers(handle, page_bufs, 0, len, NULL, + do_journal_get_write_access); + + err = walk_page_buffers(handle, page_bufs, 0, len, NULL, + write_end_fn); + } - err = walk_page_buffers(handle, page_bufs, 0, len, NULL, - write_end_fn); if (ret == 0) ret = err; EXT4_I(inode)->i_datasync_tid = handle->h_transaction->t_tid; @@ -1868,9 +1889,11 @@ static int __ext4_journalled_writepage(struct page *page, if (!ret) ret = err; - walk_page_buffers(handle, page_bufs, 0, len, NULL, bput_one); + if (!ext4_has_inline_data(inode)) + walk_page_buffers(handle, page_bufs, 0, len, NULL, bput_one); ext4_set_inode_state(inode, EXT4_STATE_JDATA); out: + brelse(inode_bh); return ret; } diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index b9e5cec..9eb42c6 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h @@ -148,6 +148,10 @@ extern int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len, unsigned copied, struct page *page); +extern struct buffer_head * +ext4_journalled_write_inline_data(struct inode *inode, + unsigned len, + struct page *page); # else /* CONFIG_EXT4_FS_XATTR */ static inline int @@ -285,6 +289,14 @@ static inline int ext4_write_inline_data_end(struct inode *inode, { return 0; } + +static inline struct buffer_head * +ext4_journalled_write_inline_data(struct inode *inode, + unsigned len, + struct page *page) +{ + return NULL; +} # endif /* CONFIG_EXT4_FS_XATTR */ #ifdef CONFIG_EXT4_FS_SECURITY