From patchwork Mon Feb 20 07:01:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ma X-Patchwork-Id: 142128 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 2C15BB6FAA for ; Mon, 20 Feb 2012 18:09:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752028Ab2BTHJa (ORCPT ); Mon, 20 Feb 2012 02:09:30 -0500 Received: from oproxy3-pub.bluehost.com ([69.89.21.8]:59300 "HELO oproxy3-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751551Ab2BTHI6 (ORCPT ); Mon, 20 Feb 2012 02:08:58 -0500 Received: (qmail 28607 invoked by uid 0); 20 Feb 2012 07:08:58 -0000 Received: from unknown (HELO box585.bluehost.com) (66.147.242.185) by oproxy3.bluehost.com with SMTP; 20 Feb 2012 07:08:58 -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=gE7ZyktJ90fk94CYArrq9sG5iffx+crN3WJmfstpyrY=; b=uFzgx78QFTJFdMj+IASY/8h/iUGOLe2V4meApZWgj+3uAOWtvLZ/NWw9XYIdyUCy24S6T7+jrQU0VLUbGEoZ6gxTTeINRZyR+bCcmlCePqr3axefSBvwVX8dtraS2lqm; 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 1RzNH5-0000US-Uq; Mon, 20 Feb 2012 00:03:04 -0700 From: Tao Ma To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH V4 19/22] ext4: Let fiemap work with inline data. Date: Mon, 20 Feb 2012 15:01:53 +0800 Message-Id: <1329721316-4955-19-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 fiemap is used to find the disk layout of a file, as for inline data, let us just pretend like a file with just one extent. Signed-off-by: Tao Ma --- fs/ext4/extents.c | 9 +++++++++ fs/ext4/inline.c | 35 +++++++++++++++++++++++++++++++++++ fs/ext4/xattr.h | 10 ++++++++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index c861727..9f609dc 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4923,6 +4923,15 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, ext4_lblk_t start_blk; int error = 0; + if (ext4_has_inline_data(inode)) { + int has_inline = 1; + + error = ext4_inline_data_fiemap(inode, fieinfo, &has_inline); + + if (has_inline) + return error; + } + /* fallback to generic here if not in extents fmt */ if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) return generic_block_fiemap(inode, fieinfo, start, len, diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index f494c5f..3a65e64 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -15,6 +15,7 @@ #include "ext4.h" #include "xattr.h" #include "truncate.h" +#include #define EXT4_XATTR_SYSTEM_DATA_NAME "data" #define EXT4_MIN_INLINE_DATA_SIZE ((sizeof(__le32) * EXT4_N_BLOCKS)) @@ -1530,3 +1531,37 @@ int ext4_destroy_inline_data(handle_t *handle, struct inode *inode) return ret; } + +int ext4_inline_data_fiemap(struct inode *inode, + struct fiemap_extent_info *fieinfo, + int *has_inline) +{ + __u64 physical = 0; + __u64 length; + __u32 flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_LAST; + int error = 0; + struct ext4_iloc iloc; + + down_read(&EXT4_I(inode)->xattr_sem); + if (!ext4_has_inline_data(inode)) { + *has_inline = 0; + goto out; + } + + error = ext4_get_inode_loc(inode, &iloc); + if (error) + goto out; + + physical = iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits; + physical += (char *)ext4_raw_inode(&iloc) - iloc.bh->b_data; + physical += offsetof(struct ext4_inode, i_block); + length = i_size_read(inode); + + if (physical) + error = fiemap_fill_next_extent(fieinfo, 0, physical, + length, flags); + brelse(iloc.bh); +out: + up_read(&EXT4_I(inode)->xattr_sem); + return (error < 0 ? error : 0); +} diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index ed3ee6b..e80a212 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h @@ -181,6 +181,9 @@ extern struct buffer_head *ext4_get_first_inline_block(struct inode *inode, void **buf, int *buf_size, int *retval); +extern int ext4_inline_data_fiemap(struct inode *inode, + struct fiemap_extent_info *fieinfo, + int *has_inline); # else /* CONFIG_EXT4_FS_XATTR */ static inline int @@ -391,6 +394,13 @@ ext4_get_first_inline_block(struct inode *inode, { return NULL; } + +static inline int ext4_inline_data_fiemap(struct inode *inode, + struct fiemap_extent_info *fieinfo, + int *has_inline) +{ + return 0; +} # endif /* CONFIG_EXT4_FS_XATTR */ #ifdef CONFIG_EXT4_FS_SECURITY