From: Tao Ma <tm@tao.ma>
To: linux-ext4@vger.kernel.org
Subject: [PATCH V6 21/23] ext4: let ext4_truncate handle inline data correctly.
Date: Fri, 14 Sep 2012 19:25:09 +0800 [thread overview]
Message-ID: <1347621911-4104-21-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>
Signed-off-by: Robin Dong <sanbai@taobao.com>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
fs/ext4/inline.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
fs/ext4/inode.c | 8 +++++
fs/ext4/xattr.h | 9 +++++
3 files changed, 107 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 6a4053e..bff1f23 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1747,3 +1747,93 @@ out:
brelse(iloc.bh);
return error;
}
+
+void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
+{
+ handle_t *handle;
+ int inline_size, value_len, needed_blocks;
+ size_t i_size;
+ void *value = NULL;
+ struct ext4_xattr_ibody_find is = {
+ .s = { .not_found = -ENODATA, },
+ };
+ struct ext4_xattr_info i = {
+ .name_index = EXT4_XATTR_INDEX_SYSTEM,
+ .name = EXT4_XATTR_SYSTEM_DATA,
+ };
+
+
+ needed_blocks = ext4_writepage_trans_blocks(inode);
+ handle = ext4_journal_start(inode, needed_blocks);
+ if (IS_ERR(handle))
+ return;
+
+ down_write(&EXT4_I(inode)->xattr_sem);
+ if (!ext4_has_inline_data(inode)) {
+ *has_inline = 0;
+ ext4_journal_stop(handle);
+ return;
+ }
+
+ if (ext4_orphan_add(handle, inode))
+ goto out;
+
+ if (ext4_get_inode_loc(inode, &is.iloc))
+ goto out;
+
+ down_write(&EXT4_I(inode)->i_data_sem);
+ i_size = inode->i_size;
+ inline_size = ext4_get_inline_size(inode);
+ EXT4_I(inode)->i_disksize = i_size;
+
+ if (i_size < inline_size) {
+ /* Clear the content in the xattr space. */
+ if (inline_size > EXT4_MIN_INLINE_DATA_SIZE) {
+ if (ext4_xattr_ibody_find(inode, &i, &is))
+ goto out_error;
+
+ BUG_ON(is.s.not_found);
+
+ value_len = le32_to_cpu(is.s.here->e_value_size);
+ value = kmalloc(value_len, GFP_NOFS);
+ if (!value)
+ goto out_error;
+
+ if (ext4_xattr_ibody_get(inode, i.name_index, i.name,
+ value, value_len))
+ goto out_error;
+
+ i.value = value;
+ i.value_len = i_size > EXT4_MIN_INLINE_DATA_SIZE ?
+ i_size - EXT4_MIN_INLINE_DATA_SIZE : 0;
+ if (ext4_xattr_ibody_inline_set(handle, inode, &i, &is))
+ goto out_error;
+ }
+
+ /* Clear the content within i_blocks. */
+ if (i_size < EXT4_MIN_INLINE_DATA_SIZE)
+ memset(ext4_raw_inode(&is.iloc)->i_block + i_size, 0,
+ EXT4_MIN_INLINE_DATA_SIZE - i_size);
+
+ EXT4_I(inode)->i_inline_size = i_size <
+ EXT4_MIN_INLINE_DATA_SIZE ?
+ EXT4_MIN_INLINE_DATA_SIZE : i_size;
+ }
+
+out_error:
+ up_write(&EXT4_I(inode)->i_data_sem);
+out:
+ brelse(is.iloc.bh);
+ up_write(&EXT4_I(inode)->xattr_sem);
+ kfree(value);
+ if (inode->i_nlink)
+ ext4_orphan_del(handle, inode);
+
+ inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
+ ext4_mark_inode_dirty(handle, inode);
+ if (IS_SYNC(inode))
+ ext4_handle_sync(handle);
+
+ ext4_journal_stop(handle);
+ return;
+}
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0b56fb0..e2bd504 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3660,6 +3660,14 @@ void ext4_truncate(struct inode *inode)
if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))
ext4_set_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE);
+ if (ext4_has_inline_data(inode)) {
+ int has_inline = 1;
+
+ ext4_inline_data_truncate(inode, &has_inline);
+ if (has_inline)
+ return;
+ }
+
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
ext4_ext_truncate(inode);
else
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
index ef9ce62..0aef19e 100644
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -190,6 +190,8 @@ extern int ext4_inline_data_fiemap(struct inode *inode,
extern int ext4_try_to_evict_inline_data(handle_t *handle,
struct inode *inode,
int needed);
+extern void ext4_inline_data_truncate(struct inode *inode, int *has_inline);
+
# else /* CONFIG_EXT4_FS_XATTR */
static inline int
@@ -409,6 +411,13 @@ static inline int ext4_inline_data_fiemap(struct inode *inode,
{
return 0;
}
+
+static inline void ext4_inline_data_truncate(struct inode *inode,
+ int *has_inline)
+{
+ return;
+}
+
# 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 ` [PATCH V6 17/23] ext4: let empty_dir handle inline dir Tao Ma
2012-09-14 11:25 ` [PATCH V6 18/23] ext4: let ext4_rename " 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 ` Tao Ma [this message]
2012-09-14 11:25 ` [PATCH V6 22/23] ext4: let fallocate handle inline data correctly 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-21-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).