From: Tao Ma <tm@tao.ma>
To: linux-ext4@vger.kernel.org
Subject: [PATCH V6 17/23] ext4: let empty_dir handle inline dir.
Date: Fri, 14 Sep 2012 19:25:05 +0800 [thread overview]
Message-ID: <1347621911-4104-17-git-send-email-tm@tao.ma> (raw)
In-Reply-To: <1347621911-4104-1-git-send-email-tm@tao.ma>
From: Tao Ma <boyu.mt@taobao.com>
empty_dir is used when deleting a dir. So it should handle
inline dir properly.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
fs/ext4/inline.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
fs/ext4/namei.c | 8 +++++
fs/ext4/xattr.h | 6 +++
3 files changed, 104 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 21c8957..5bf1326 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1559,6 +1559,96 @@ out:
return err;
}
+/*
+ * Get the inline dentry at offset.
+ */
+static inline struct ext4_dir_entry_2 *
+ext4_get_inline_entry(struct inode *inode,
+ struct ext4_iloc *iloc,
+ unsigned int offset,
+ void **inline_start,
+ int *inline_size)
+{
+ void *inline_pos;
+
+ BUG_ON(offset > ext4_get_inline_size(inode));
+
+ if (offset < EXT4_MIN_INLINE_DATA_SIZE) {
+ inline_pos = (void *)ext4_raw_inode(iloc)->i_block;
+ *inline_size = EXT4_MIN_INLINE_DATA_SIZE;
+ } else {
+ inline_pos = ext4_get_inline_xattr_pos(inode, iloc);
+ offset -= EXT4_MIN_INLINE_DATA_SIZE;
+ *inline_size = ext4_get_inline_size(inode) -
+ EXT4_MIN_INLINE_DATA_SIZE;
+ }
+
+ if (inline_start)
+ *inline_start = inline_pos;
+ return (struct ext4_dir_entry_2 *)(inline_pos + offset);
+}
+
+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;
+ 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 = (struct ext4_dir_entry_2 *)ext4_raw_inode(&iloc)->i_block;
+ if (!le32_to_cpu(de->inode)) {
+ ext4_warning(dir->i_sb,
+ "bad inline directory (dir #%lu) - no `..'",
+ dir->i_ino);
+ ret = 1;
+ goto out;
+ }
+
+ offset = EXT4_INLINE_DOTDOT_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 bdb7403..f2a4ba6 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2387,6 +2387,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 62a242a..2791d9a 100644
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -180,6 +180,7 @@ extern int ext4_delete_inline_entry(handle_t *handle,
struct ext4_dir_entry_2 *de_del,
struct buffer_head *bh,
int *has_inline_data);
+extern int empty_inline_dir(struct inode *dir, int *has_inline_data);
# else /* CONFIG_EXT4_FS_XATTR */
static inline int
@@ -379,6 +380,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.1
next prev parent reply other threads:[~2012-09-14 11:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 11:18 [PATCH V6 00/23] ext4: Add inline data support Tao Ma
2012-09-14 11:24 ` [PATCH V6 01/23] ext4: Move extra inode read to a new function Tao Ma
2012-09-14 11:24 ` [PATCH V6 02/23] ext4: export inline xattr functions Tao Ma
2012-09-14 11:24 ` [PATCH V6 03/23] ext4: Add the basic function for inline data support Tao Ma
2012-09-14 11:24 ` [PATCH V6 04/23] ext4: Add read support for inline data Tao Ma
2012-09-14 11:24 ` [PATCH V6 05/23] ext4: Add normal write " Tao Ma
2012-09-14 11:24 ` [PATCH V6 06/23] ext4: Add journalled " Tao Ma
2012-09-14 11:24 ` [PATCH V6 07/23] ext4: Add delalloc " Tao Ma
2012-09-14 11:24 ` [PATCH V6 08/23] ext4: Make ext4_init_dot_dotdot for inline dir usage Tao Ma
2012-09-14 11:24 ` [PATCH V6 09/23] ext4: Refactor __ext4_check_dir_entry to accepts start and size Tao Ma
2012-09-14 11:24 ` [PATCH V6 10/23] ext4: Create __ext4_insert_dentry for dir entry insertion Tao Ma
2012-09-14 11:24 ` [PATCH V6 11/23] ext4: let add_dir_entry handle inline data properly Tao Ma
2012-09-14 11:25 ` [PATCH V6 12/23] ext4: Let ext4_readdir handle inline data Tao Ma
2012-09-14 11:25 ` [PATCH V6 13/23] ext4: Create a new function search_dir Tao Ma
2012-09-14 11:25 ` [PATCH V6 14/23] ext4: let ext4_find_entry handle inline data Tao Ma
2012-09-14 11:25 ` [PATCH V6 15/23] ext4: make ext4_delete_entry generic Tao Ma
2012-09-14 11:25 ` [PATCH V6 16/23] ext4: let ext4_delete_entry handle inline data Tao Ma
2012-09-14 11:25 ` Tao Ma [this message]
2012-09-14 11:25 ` [PATCH V6 18/23] ext4: let ext4_rename handle inline dir Tao Ma
2012-09-14 11:25 ` [PATCH V6 19/23] ext4: Let fiemap work with inline data Tao Ma
2012-09-14 11:25 ` [PATCH V6 20/23] ext4: Evict inline data out if we needs to strore xattr in inode Tao Ma
2012-09-14 11:25 ` [PATCH V6 21/23] ext4: let ext4_truncate handle inline data correctly Tao Ma
2012-09-14 11:25 ` [PATCH V6 22/23] ext4: let fallocate " Tao Ma
2012-09-14 11:25 ` [PATCH V6 23/23] ext4: Enable ext4 inline support Tao Ma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347621911-4104-17-git-send-email-tm@tao.ma \
--to=tm@tao.ma \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).