From patchwork Mon Feb 20 07:01:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ma X-Patchwork-Id: 142134 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 2FE21B6FAB for ; Mon, 20 Feb 2012 18:10:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051Ab2BTHJg (ORCPT ); Mon, 20 Feb 2012 02:09:36 -0500 Received: from oproxy1-pub.bluehost.com ([66.147.249.253]:35693 "HELO oproxy1-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751184Ab2BTHI5 (ORCPT ); Mon, 20 Feb 2012 02:08:57 -0500 Received: (qmail 18272 invoked by uid 0); 20 Feb 2012 07:08:56 -0000 Received: from unknown (HELO box585.bluehost.com) (66.147.242.185) by oproxy1.bluehost.com with SMTP; 20 Feb 2012 07:08:56 -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=GvCejgy0Ekp/7eKhEGT695CIDf4xtuwWFaDpzUPjx/M=; b=cSyy8rk4GKi1mkRg4fofPuyM0F4pq4h7wyWNdkXVfivfzUpeKMVNs0I3kVFTZo/shT/zzY0QwuW9G20dMdvR3ugzCWAfz//T/sALG4V0oZW4deIvhWn3Vqc5GoxdnHa8; 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 1RzNGv-0000US-9Z; Mon, 20 Feb 2012 00:02:54 -0700 From: Tao Ma To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH V4 14/22] ext4: let ext4_find_entry handle inline data. Date: Mon, 20 Feb 2012 15:01:48 +0800 Message-Id: <1329721316-4955-14-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 Create a new ext4_find_inline_entry to handle the case of inline data. Signed-off-by: Tao Ma --- fs/ext4/inline.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ fs/ext4/namei.c | 10 +++++++++- fs/ext4/xattr.h | 12 ++++++++++++ 3 files changed, 68 insertions(+), 1 deletions(-) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index e238b64..90e1671 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1338,6 +1338,53 @@ out: return ret; } +struct buffer_head *ext4_find_inline_entry(struct inode *dir, + const struct qstr *d_name, + struct ext4_dir_entry_2 **res_dir, + int *has_inline_data) +{ + int ret; + struct ext4_iloc iloc; + void *inline_start; + int inline_size; + + if (ext4_get_inode_loc(dir, &iloc)) + return NULL; + + down_read(&EXT4_I(dir)->xattr_sem); + if (!ext4_has_inline_data(dir)) { + *has_inline_data = 0; + goto out; + } + + inline_start = ext4_raw_inode(&iloc)->i_block; + inline_size = EXT4_MIN_INLINE_DATA_SIZE; + ret = search_dir(iloc.bh, inline_start, inline_size, + dir, d_name, 0, res_dir); + if (ret == 1) + goto out_find; + if (ret < 0) + goto out; + + if (ext4_get_inline_size(dir) == EXT4_MIN_INLINE_DATA_SIZE) + goto out; + + inline_start = ext4_get_inline_xattr_pos(dir, &iloc); + inline_size = ext4_get_inline_size(dir) - EXT4_MIN_INLINE_DATA_SIZE; + + ret = search_dir(iloc.bh, inline_start, inline_size, + dir, d_name, 0, res_dir); + if (ret == 1) + goto out_find; + +out: + brelse(iloc.bh); + iloc.bh = NULL; +out_find: + up_read(&EXT4_I(dir)->xattr_sem); + return iloc.bh; +} + int ext4_destroy_inline_data(handle_t *handle, struct inode *inode) { int ret; diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 7e74503..1de97f5 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -844,7 +844,6 @@ static inline int search_dirblock(struct buffer_head *bh, d_name, offset, res_dir); } - /* * ext4_find_entry() * @@ -879,6 +878,15 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, namelen = d_name->len; if (namelen > EXT4_NAME_LEN) return NULL; + + if (ext4_has_inline_data(dir)) { + int has_inline_data = 1; + ret = ext4_find_inline_entry(dir, d_name, res_dir, + &has_inline_data); + if (has_inline_data) + return ret; + } + if ((namelen <= 2) && (name[0] == '.') && (name[1] == '.' || name[1] == '\0')) { /* diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index 8092846..b86391f 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h @@ -168,6 +168,10 @@ extern int ext4_try_create_inline_dir(handle_t *handle, struct inode *inode); extern int ext4_read_inline_dir(struct file *filp, void *dirent, filldir_t filldir); +extern struct buffer_head *ext4_find_inline_entry(struct inode *dir, + const struct qstr *d_name, + struct ext4_dir_entry_2 **res_dir, + int *has_inline_data); # else /* CONFIG_EXT4_FS_XATTR */ static inline int @@ -350,6 +354,14 @@ static inline int ext4_read_inline_dir(struct file *filp, { return 0; } + +struct buffer_head *ext4_find_inline_entry(struct inode *dir, + const struct qstr *d_name, + struct ext4_dir_entry_2 **res_dir, + int *has_inline_data) +{ + return NULL; +} # endif /* CONFIG_EXT4_FS_XATTR */ #ifdef CONFIG_EXT4_FS_SECURITY