From: Tao Ma Subject: [PATCH V3 17/21] ext4: let empty_dir handle inline dir. Date: Sun, 18 Dec 2011 22:24:34 +0800 Message-ID: <1324218278-2460-17-git-send-email-tm@tao.ma> References: <4EEDF6B1.7050206@tao.ma> <1324218278-2460-1-git-send-email-tm@tao.ma> Cc: adilger@dilger.ca, tytso@mit.edu, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org To: linux-ext4@vger.kernel.org Return-path: Received: from oproxy9.bluehost.com ([69.89.24.6]:40479 "HELO oproxy9.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751556Ab1LROgj (ORCPT ); Sun, 18 Dec 2011 09:36:39 -0500 In-Reply-To: <1324218278-2460-1-git-send-email-tm@tao.ma> Sender: linux-ext4-owner@vger.kernel.org List-ID: From: Tao Ma empty_dir is used when deleting a dir. So it should handle inline dir properly. Signed-off-by: Tao Ma --- fs/ext4/inline.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ext4/namei.c | 8 ++++++ fs/ext4/xattr.h | 6 ++++ 3 files changed, 83 insertions(+), 0 deletions(-) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 1d5cfd0..1872532 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1425,6 +1425,75 @@ out: return err; } +int empty_inline_dir(struct inode *dir, int *has_inline_data) +{ + int err, inline_size; + struct ext4_iloc iloc; + void *inline_pos; + unsigned int offset; + struct ext4_dir_entry_2 *de, *de1; + int ret = 1; + + err = ext4_get_inode_loc(dir, &iloc); + if (err) { + EXT4_ERROR_INODE(dir, "error %d getting inode %lu block", + err, dir->i_ino); + return 1; + } + + down_read(&EXT4_I(dir)->xattr_sem); + if (!ext4_has_inline_data(dir)) { + *has_inline_data = 0; + goto out; + } + + de = ext4_get_inline_entry(dir, &iloc, 0, + &inline_pos, &inline_size); + de1 = ext4_get_inline_entry(dir, &iloc, + ext4_rec_len_from_disk(de->rec_len, inline_size), + &inline_pos, &inline_size); + if (le32_to_cpu(de->inode) != dir->i_ino || + !le32_to_cpu(de1->inode) || + strcmp(".", de->name) || + strcmp("..", de1->name)) { + ext4_warning(dir->i_sb, + "bad directory (dir #%lu) - no `.' or `..'", + dir->i_ino); + ret = 1; + goto out; + } + + offset = ext4_rec_len_from_disk(de->rec_len, inline_size) + + ext4_rec_len_from_disk(de1->rec_len, inline_size); + while (offset < dir->i_size) { + de = ext4_get_inline_entry(dir, &iloc, offset, + &inline_pos, &inline_size); + if (ext4_check_dir_entry(dir, NULL, de, + iloc.bh, inline_pos, + inline_size, offset)) { + ext4_warning(dir->i_sb, + "bad inline directory (dir #%lu) - " + "inode %u, rec_len %u, name_len %d" + "inline size %d\n", + dir->i_ino, le32_to_cpu(de->inode), + le16_to_cpu(de->rec_len), de->name_len, + inline_size); + ret = 1; + goto out; + } + if (le32_to_cpu(de->inode)) { + ret = 0; + goto out; + } + offset += ext4_rec_len_from_disk(de->rec_len, inline_size); + } + +out: + up_read(&EXT4_I(dir)->xattr_sem); + brelse(iloc.bh); + return ret; +} + 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 cefcec6..24cdb61 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2015,6 +2015,14 @@ static int empty_dir(struct inode *inode) struct super_block *sb; int err = 0; + if (ext4_has_inline_data(inode)) { + int has_inline_data = 1; + + err = empty_inline_dir(inode, &has_inline_data); + if (has_inline_data) + return err; + } + sb = inode->i_sb; if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2) || !(bh = ext4_bread(NULL, inode, 0, 0, &err))) { diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index e26b7a6..ed707df 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h @@ -176,6 +176,7 @@ extern int ext4_delete_inline_entry(handle_t *handle, struct inode *dir, struct ext4_dir_entry_2 *de_del, struct buffer_head *bh); +extern int empty_inline_dir(struct inode *dir, int *has_inline_data); # else /* CONFIG_EXT4_FS_XATTR */ static inline int @@ -373,6 +374,11 @@ static inline int ext4_delete_inline_entry(handle_t *handle, { return 0; } + +static inline int empty_inline_dir(struct inode *dir, int *has_inline_data) +{ + return 0; +} # endif /* CONFIG_EXT4_FS_XATTR */ #ifdef CONFIG_EXT4_FS_SECURITY -- 1.7.0.4