[PATCH V2 16/19] ext4: let ext4_delete_entry handle inline data.
From: Tao Ma <hidden>
Date: 2011-11-21 16:39:54
Also in:
linux-fsdevel, lkml
Subsystem:
ext4 file system, filesystems (vfs and infrastructure), the rest · Maintainers:
"Theodore Ts'o", Alexander Viro, Christian Brauner, Linus Torvalds
From: Tao Ma <redacted> Signed-off-by: Tao Ma <redacted> --- fs/ext4/inline.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ext4/namei.c | 9 +++++++++ fs/ext4/xattr.h | 11 +++++++++++ 3 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index c76ae3b..302925e 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c@@ -1355,6 +1355,58 @@ out_find: return iloc.bh; } +int ext4_delete_inline_entry(handle_t *handle, + struct inode *dir, + struct ext4_dir_entry_2 *de_del, + struct buffer_head *bh) +{ + int err, inline_size; + struct ext4_iloc iloc; + void *inline_start; + + err = ext4_get_inode_loc(dir, &iloc); + if (err) + return err; + + down_write(&EXT4_I(dir)->xattr_sem); + if (!ext4_has_inline_data(dir)) + goto out; + + if ((void *)de_del - ((void *)ext4_raw_inode(&iloc)->i_block) < + EXT4_MIN_INLINE_DATA_SIZE) { + inline_start = ext4_raw_inode(&iloc)->i_block; + inline_size = EXT4_MIN_INLINE_DATA_SIZE; + } else { + inline_start = ext4_get_inline_xattr_pos(dir, &iloc); + inline_size = ext4_get_inline_size(dir) - + EXT4_MIN_INLINE_DATA_SIZE; + } + + err = ext4_journal_get_write_access(handle, bh); + if (err) + goto out; + + err = ext4_generic_delete_entry(handle, dir, de_del, bh, + inline_start, inline_size); + if (err) + goto out; + + BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata"); + get_bh(iloc.bh); + err = ext4_mark_inode_dirty(handle, dir); + if (unlikely(err)) + goto out; + + ext4_show_inline_dir(dir, iloc.bh, inline_start, inline_size); + err = 1; +out: + up_write(&EXT4_I(dir)->xattr_sem); + brelse(iloc.bh); + if (err != 1 && err != -ENOENT) + ext4_std_error(dir->i_sb, err); + return err; +} + 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 f706b0f..cefcec6 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c@@ -1741,6 +1741,15 @@ static int ext4_delete_entry(handle_t *handle, { int err; + if (ext4_has_inline_data(dir)) { + err = ext4_delete_inline_entry(handle, dir, de_del, bh); + if (err) { + if (err == 1) + err = 0; + return err; + } + } + BUFFER_TRACE(bh, "get_write_access"); err = ext4_journal_get_write_access(handle, bh); if (unlikely(err))
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
index f4d4cb1..ccd994e 100644
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h@@ -174,6 +174,10 @@ 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); +extern int ext4_delete_inline_entry(handle_t *handle, + struct inode *dir, + struct ext4_dir_entry_2 *de_del, + struct buffer_head *bh); # else /* CONFIG_EXT4_FS_XATTR */ static inline int
@@ -370,6 +374,13 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir, { return NULL; } +static inline int ext4_delete_inline_entry(handle_t *handle, + struct inode *dir, + struct ext4_dir_entry_2 *de_del, + struct buffer_head *bh) +{ + return 0; +} # endif /* CONFIG_EXT4_FS_XATTR */ #ifdef CONFIG_EXT4_FS_SECURITY
--
1.7.0.4