All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tao Ma <tm@tao.ma>
To: linux-ext4@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org
Subject: [PATCH V4 21/22] ext4: let ext4_truncate handle inline data correctly.
Date: Mon, 20 Feb 2012 15:01:55 +0800	[thread overview]
Message-ID: <1329721316-4955-21-git-send-email-tm@tao.ma> (raw)
In-Reply-To: <1329721316-4955-1-git-send-email-tm@tao.ma>

From: Robin Dong <sanbai@taobao.com>

Signed-off-by: Robin Dong <sanbai@taobao.com>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
 fs/ext4/inline.c |   74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 fs/ext4/inode.c  |    5 +++
 fs/ext4/xattr.h  |    8 ++++++
 3 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index b8576be..0d32a39 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1651,3 +1651,77 @@ out:
 	brelse(iloc.bh);
 	return error;
 }
+
+void ext4_inline_data_truncate(struct inode *inode)
+{
+	handle_t *handle;
+	int inline_size = ext4_get_inline_size(inode);
+	size_t isize = i_size_read(inode);
+	int needed_blocks, value_len;
+	void *value = NULL;
+	struct ext4_xattr_ibody_find is = {
+		.s = { .not_found = -ENODATA, },
+	};
+	struct ext4_xattr_info i = {
+		.name_index = EXT4_XATTR_INDEX_SYSTEM_DATA,
+		.name = EXT4_XATTR_SYSTEM_DATA_NAME,
+	};
+
+	needed_blocks = ext4_writepage_trans_blocks(inode);
+	handle = ext4_journal_start(inode, needed_blocks);
+	if (IS_ERR(handle))
+		return;
+
+	if (ext4_orphan_add(handle, inode))
+		goto out;
+
+	EXT4_I(inode)->i_disksize = inode->i_size;
+
+	if (isize < ext4_get_max_inline_size(inode)) {
+		if (ext4_get_inode_loc(inode, &is.iloc))
+			goto out;
+
+		if (isize < EXT4_MIN_INLINE_DATA_SIZE)
+			memset(ext4_raw_inode(&is.iloc)->i_block + isize, 0,
+					EXT4_MIN_INLINE_DATA_SIZE - isize);
+		if (inline_size > EXT4_MIN_INLINE_DATA_SIZE &&
+				isize < inline_size) {
+			if (ext4_xattr_ibody_find(inode, &i, &is))
+				goto out_bh;
+
+			BUG_ON(!is.s.not_found);
+
+			value_len = le32_to_cpu(is.s.here->e_value_size);
+			value = kmalloc(value_len, GFP_NOFS);
+
+			if (ext4_xattr_ibody_get(inode, i.name_index, i.name,
+						value, value_len))
+				goto out_bh;
+
+			i.value = value;
+			i.value_len = isize - EXT4_MIN_INLINE_DATA_SIZE;
+			if (ext4_xattr_ibody_inline_set(handle, inode, &i, &is))
+				goto out_bh;
+		}
+		if (isize < inline_size)
+			EXT4_I(inode)->i_inline_size = isize <
+				EXT4_MIN_INLINE_DATA_SIZE ?
+				EXT4_MIN_INLINE_DATA_SIZE : isize;
+out_bh:
+		if (value)
+			kfree(value);
+		brelse(is.iloc.bh);
+	} else
+		ext4_convert_inline_data_to_extent(inode->i_mapping, inode, 0);
+
+out:
+	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);
+}
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 549af8f..805709b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3496,6 +3496,11 @@ 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)) {
+		ext4_inline_data_truncate(inode);
+		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 d74df33..4f12d02 100644
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -187,6 +187,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);
+
 # else  /* CONFIG_EXT4_FS_XATTR */
 
 static inline int
@@ -404,6 +406,12 @@ static inline int ext4_inline_data_fiemap(struct inode *inode,
 {
 	return 0;
 }
+
+static inline void ext4_inline_data_truncate(struct inode *inode)
+{
+	return;
+}
+
 # endif  /* CONFIG_EXT4_FS_XATTR */
 
 #ifdef CONFIG_EXT4_FS_SECURITY
-- 
1.7.0.4


  parent reply	other threads:[~2012-02-20  7:01 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-20  7:00 [PATCH V4 00/22] ext4: Add inline data support Tao Ma
2012-02-20  7:01 ` [PATCH V4 01/22] ext4: Move extra inode read to a new function Tao Ma
2012-02-20  7:01   ` [PATCH V4 02/22] ext4: export inline xattr functions Tao Ma
2012-02-21 22:45     ` Andreas Dilger
2012-02-20  7:01   ` [PATCH V4 03/22] ext4: Add the basic function for inline data support Tao Ma
2012-04-07  0:21     ` Andreas Dilger
2012-04-13  2:59       ` Tao Ma
2012-02-20  7:01   ` [PATCH V4 04/22] ext4: Add read support for inline data Tao Ma
2012-02-20  7:01   ` [PATCH V4 05/22] ext4: Add normal write " Tao Ma
2012-02-20  7:01   ` [PATCH V4 06/22] ext4: Add journalled " Tao Ma
2012-02-20  7:01   ` [PATCH V4 07/22] ext4: Add delalloc " Tao Ma
2012-02-20  7:01   ` [PATCH V4 08/22] ext4: Create a new function ext4_init_new_dir Tao Ma
2012-02-20  7:01   ` [PATCH V4 09/22] ext4: Refactor __ext4_check_dir_entry to accepts start and size Tao Ma
2012-02-20  7:01   ` [PATCH V4 10/22] ext4: Create __ext4_insert_dentry for dir entry insertion Tao Ma
2012-02-20  7:01   ` [PATCH V4 11/22] ext4: let add_dir_entry handle inline data properly Tao Ma
2012-02-20  7:01   ` [PATCH V4 12/22] ext4: Let ext4_readdir handle inline data Tao Ma
2012-02-20  7:01   ` [PATCH V4 13/22] ext4: Create a new function search_dir Tao Ma
2012-02-20  7:01   ` [PATCH V4 14/22] ext4: let ext4_find_entry handle inline data Tao Ma
2012-02-20  7:01   ` [PATCH V4 15/22] ext4: make ext4_delete_entry generic Tao Ma
2012-02-20  7:01   ` [PATCH V4 16/22] ext4: let ext4_delete_entry handle inline data Tao Ma
2012-02-20  7:01   ` [PATCH V4 17/22] ext4: let empty_dir handle inline dir Tao Ma
2012-04-07  0:21     ` Andreas Dilger
2012-04-17  3:55       ` Tao Ma
2012-02-20  7:01   ` [PATCH V4 18/22] ext4: let ext4_rename " Tao Ma
2012-02-20  7:01   ` [PATCH V4 19/22] ext4: Let fiemap work with inline data Tao Ma
2012-02-20  7:01   ` [PATCH V4 20/22] ext4: Evict inline data out if we needs to strore xattr in inode Tao Ma
2012-02-20  7:01   ` Tao Ma [this message]
2012-02-20  7:01   ` [PATCH V4 22/22] ext4: Enable ext4 inline support Tao Ma
2012-02-21  6:51   ` [PATCH V4 01/22] ext4: Move extra inode read to a new function Andreas Dilger
2012-02-21  8:13     ` Tao Ma
2012-02-21 23:44 ` [PATCH V4 00/22] ext4: Add inline data support Andreas Dilger
2012-02-22  1:34   ` 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=1329721316-4955-21-git-send-email-tm@tao.ma \
    --to=tm@tao.ma \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.